【fix】修改bug

src/main/webapp/WEB-INF/classes/csh/CSH501/hls_bp_master_same_agent_for_lov.lwm

@@ -11,7 +11,8 @@
             <bm:query-sql><![CDATA[
             select t1.unit_id,
                    t1.bp_code,
-                   t1.enable_flag,
+                   t1.enabled_flag,
+                   t1.bp_category,
                    t1.bp_name
               FROM hls_bp_master t1
               WHERE
@@ -21,15 +22,14 @@
                     FROM exp_emp_assign_e_v v
                     WHERE v.user_id=${/session/@user_id}
                    )
-              #WHERE_CLAUSE#
   			]]></bm:query-sql>
         </bm:operation>
     </bm:operations>
     <bm:fields>
         <bm:field name="unit_id" displayWidth="200"/>
-        <bm:field name="bp_code" displayWidth="200" forDisplay="true" forQuery="true" prompt="商业伙伴编码"/>
+        <bm:field name="bp_code" displayWidth="150" forDisplay="true" forQuery="true" prompt="商业伙伴编码"/>
         <bm:field name="bp_name" displayWidth="200" forDisplay="true" forQuery="true" prompt="商业伙伴名称"/>
-        <bm:field name="enable_flag"/>
+        <bm:field name="enabled_flag"/>
         <bm:field name="bp_category"/>
     </bm:fields>
     <bm:query-fields>

src/main/webapp/modules/acp/ACP522/ap_invoice_import.lview

@@ -30,7 +30,7 @@
             }
         };
 
-        function ap_invoice_import_detail(record_id,ds_id){debugger;
+        function ap_invoice_import_detail(record_id,ds_id){
             var record = $(ds_id).findById(record_id);
             var param = record.data;
             param['function_usage'] = 'MODIFY';

src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview

@@ -297,7 +297,7 @@
             </a:screenTopToolbar>-
             <a:queryForm id="condition_queryForm" bindTarget="allConditionDs" createSearchButton="false" resultTarget="contractDs">
                 <a:formToolBar labelWidth="100">
-                    <a:lov name="billing_object_name" bindTarget="allConditionDs" prompt="承租人"/>
+                    <a:lov name="billing_object_name" bindTarget="allConditionDs" prompt="开票对象"/>
 
 <!--
                     <a:comboBox name="bill_object_bp_class_desc" bindTarget="allConditionDs" prompt="客户类型"/>
@@ -359,7 +359,7 @@
                                 <a:column name="billing_amount" align="right" prompt="已开票金额" renderer="Leaf.formatMoney"/>
                              <!--   <a:column name="billing_principal" align="right" prompt="已开票本金" renderer="Leaf.formatMoney"/>
                                 <a:column name="billing_interest" align="right" prompt="已开票利息" renderer="Leaf.formatMoney"/>-->
-                                <a:column name="last_received_date" prompt="最后收款日" renderer="Leaf.formatDate"/>
+                                <a:column name="last_received_date" prompt="最后核销日" renderer="Leaf.formatDate"/>
 <!--
                                 <a:column name="termination_date" prompt="正常结清日" renderer="Leaf.formatDate"/>
 -->

src/main/webapp/modules/cont/CON1020/contract_penalty_reduction_create.lview

@@ -161,7 +161,7 @@
                    // var v_status = res.result.v_status;
                     //if (v_status == 1) {
                     Leaf.SideBar.show({
-                        msg: '取消成功',
+                        msg: '操作成功',
                         duration: 2000
                     });
                     //}

src/main/webapp/modules/cont/CON1021/contract_penalty_reduction_create.lview

@@ -47,7 +47,7 @@
         function open_contract_detail_win(ds_id, record_id) {
             var record = $(ds_id).findById(record_id);
             var param = record.data;
-            if (record.data.status == 'APPROVED' || record.data.status == 'APPROVING'||record.data.status == 'CANCEL') {
+            if (record.data.status == 'APPROVED' || record.data.status == 'APPROVING'||record.data.status == 'CANCEL'||record.data.status == 'REJECT') {
                 param['function_code'] = 'CON1020_C_R';
                 param['function_usage'] = 'QUERY';
                 param['maintain_type'] = 'QUERY';