Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into feature/agent

src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_status.lwm

@@ -13,7 +13,8 @@
                 select v.code_value, v.code_value_name
                 from sys_code_values_v v
                 where v.code = 'CON500_CONTRACT_STATUS'
-                and v.code_value in ('ETING', 'INCEPT', 'TERMINATING')
+                and v.code_value in ('ETING', 'INCEPT', 'TERMINATING','REPUR')
+                and v.code_enabled_flag = 'Y'
                 ]]></bm:query-sql>
         </bm:operation>
     </bm:operations>

src/main/webapp/WEB-INF/classes/hls/HLS303/hls_bp_master_asgent_modify.lwm

@@ -48,8 +48,8 @@
                                 bp.enabled_flag,
                                 decode(nvl(bp.certification_status,'N'),'N','未认证','认证完成')certification_status,
                                 bp.re_kunnr,
-                                bp.re_lifnr
-
+                                bp.re_lifnr,
+                                bp.sbo_bp_message
                            FROM hls_bp_master bp
                           WHERE bp.bp_category = 'AGENT'
                             AND NVL(bp.agent_instance_status, 'NEW') IN
@@ -91,6 +91,7 @@
         <bm:field name="certification_status"/>
         <bm:field name="re_kunnr"/>
         <bm:field name="re_lifnr"/>
+        <bm:field name="sbo_bp_message"/>
     </bm:fields>
     <bm:query-fields>
         <bm:query-field field="bp_code" queryExpression="t1.bp_code like upper(&apos;%&apos;||${@bp_code}||&apos;%&apos;)"/>

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain.lview

@@ -138,6 +138,7 @@
             <a:dataSet id="con560_contract_status_ds" autoQuery="true" model="cont.CON560.con_contract_status"/>
             <a:dataSet id="con560_lease_organization_name_ds" loadData="true"
                        model="basic.hls_lease_organization_for_lov"/>
+            <a:dataSet id="con560_contract_status_grid_ds" lookupCode="CON500_CONTRACT_STATUS"/>
             <a:dataSet id="con560_contract_query_ds" autoCreate="true">
                 <a:fields>
                     <a:field name="bp_name"  lovGridHeight="350" lovHeight="500" lovLabelWidth="100"
@@ -178,7 +179,7 @@
                        selectable="true" selectionModel="single">
                 <a:fields>
                     <a:field name="contract_status_n" displayField="code_value_name"
-                             options="con560_contract_status_ds" returnField="contract_status"
+                             options="con560_contract_status_grid_ds" returnField="contract_status"
                              valueField="code_value"/>
                 </a:fields>
                 <a:events>

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain_wfl.lview

@@ -138,6 +138,7 @@
             <a:dataSet id="con560_contract_status_ds" autoQuery="true" model="cont.CON560.con_contract_status"/>
             <a:dataSet id="con560_lease_organization_name_ds" loadData="true"
                        model="basic.hls_lease_organization_for_lov"/>
+            <a:dataSet id="con560_contract_status_grid_ds" lookupCode="CON500_CONTRACT_STATUS"/>
             <a:dataSet id="con560_contract_query_ds" autoCreate="true">
                 <a:fields>
                     <a:field name="bp_name" autoComplete="true" lovGridHeight="350" lovHeight="500" lovLabelWidth="100"
@@ -173,7 +174,7 @@
                        selectable="true" selectionModel="single">
                 <a:fields>
                     <a:field name="contract_status_n" displayField="code_value_name"
-                             options="con560_contract_status_ds" returnField="contract_status"
+                             options="con560_contract_status_grid_ds" returnField="contract_status"
                              valueField="code_value"/>
                 </a:fields>
                 <a:events>

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

@@ -635,7 +635,7 @@
             }
             if(line_records.length>1){
                 window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                Leaf.showMessage('${l:PROMPT}', '一次只能选择一条数据进行操作！');
+                Leaf.showMessage('${l:PROMPT}', '一次支付只支持同一合同！');
                 return;
 
             }

src/main/webapp/modules/csh/CSH502/csh_payment_req_query.lview

@@ -47,7 +47,19 @@
                 // return '<a href="javascript:openWindow(\'' + url + '\');">' + value + '</a>';
                 // }
             }
-            
+        function construct_from_to() {
+            var config = ['amount', 'bank_slip_num', 'transaction_amount', 'currency_code', 'bank_account_code'];
+            var pattern = ['_from', '_to'];
+            var obj = {};
+            for (var i = 0,
+                     j = config.length; i < j; i++) {
+                for (var m = 0,
+                         n = pattern.length; m < n; m++) {
+                    obj[config[i] + pattern[m]] = config[i] + pattern[n - 1 - m];
+                }
+            }
+            return obj;
+        }
             
             // function openWindow(url) {
             // new Leaf.Window({
@@ -78,6 +90,18 @@
             }
             
             function onUpdate_payment_req(ds, record, name, value, oldvalue) {
+
+/*
+                var from_to = construct_from_to();
+                var opposite_name = from_to[name];
+                if (!Ext.isEmpty(opposite_name)) {
+                    var opposite_value = record.get(opposite_name);
+                    if (!Ext.isEmpty(value) && Ext.isEmpty(opposite_value)) {
+                        record.set(opposite_name, value);
+                    }
+                }
+*/
+
                 if (name == 'payment_req_number_from') {
                     if (record.get('payment_req_number_to') == 'undefined' || record.get('payment_req_number_to') == null || record.get('payment_req_number_to') == '') {
                         record.set('payment_req_number_to', value);
@@ -95,13 +119,21 @@
                         record.set('approval_date_from', value);
                     }
                 } else if (name == 'amount_from') {
+                    var formatMoney=value.replace(/\,/g, "");
                     if (record.get('amount_to') == 'undefined' || record.get('amount_to') == null || record.get('amount_to') == '') {
-                        record.set('amount_to', value);
+
+                        record.set('amount_to', formatMoney);
                     }
+                    ds.getAt(0).set('amount_from', formatMoney)
+                    record.set('amount_from', formatMoney);
+
                 } else if (name == 'amount_to') {
+                    var formatMoney=value.replace(/\,/g, "");
                     if (record.get('amount_from') == 'undefined' || record.get('amount_from') == null || record.get('amount_from') == '') {
-                        record.set('amount_from', value);
+                        record.set('amount_from', formatMoney);
                     }
+                    record.set('amount_to', formatMoney);
+
                 } else if (name == 'req_date_from') {
                     if (record.get('req_date_to') == 'undefined' || record.get('req_date_to') == null || record.get('req_date_to') == '') {
                         record.set('req_date_to', value);
@@ -378,13 +410,13 @@
                     <!-- <a:column name="status_n" align="center" prompt="BPM状态" width="80"/> -->
                   <!--  <a:column name="user_name" prompt="CSH502.CSH_PROPOSER" width="120"/>-->
                     <a:column name="req_date" align="center" prompt="CSH502.CSH_REQ_DATE" width="120"/>
-                    <a:column name="amount" align="center" prompt="应付金额" width="120" renderer="Leaf.formatMoney"/>
+                    <a:column name="amount" align="right" prompt="应付金额" width="120" renderer="Leaf.formatMoney"/>
                     <a:column name="bp_id_agent_n" align="center" prompt="代理店" width="120"/>
-                    <a:column name="amount_agent_total" align="center" prompt="应付代理店金额" width="120" renderer="Leaf.formatMoney"/>
-                    <a:column name="residual_agent_amount" align="center" prompt="未付代理店金额" width="120" renderer="Leaf.formatMoney"/>
+                    <a:column name="amount_agent_total" align="right" prompt="应付代理店金额" width="120" renderer="Leaf.formatMoney"/>
+                    <a:column name="residual_agent_amount" align="right" prompt="未付代理店金额" width="120" renderer="Leaf.formatMoney"/>
                     <a:column name="vender_name" align="center" prompt="厂商" width="120"/>
-                    <a:column name="amount_vender_total" align="center" prompt="应付厂商金额" width="120" renderer="Leaf.formatMoney"/>
-                    <a:column name="residual_vender_amount" align="center" prompt="未付厂商金额" width="120" renderer="Leaf.formatMoney"/>
+                    <a:column name="amount_vender_total" align="right" prompt="应付厂商金额" width="120" renderer="Leaf.formatMoney"/>
+                    <a:column name="residual_vender_amount" align="right" prompt="未付厂商金额" width="120" renderer="Leaf.formatMoney"/>
 
 <!--                    <a:column name="bp_id_tenant_n" align="center" prompt="承租人"/>-->
 <!--                    <a:column name="apply_amount" align="right" prompt="CSH501.CSH_APPLIED_TOTAL_AMOUNT" renderer="Leaf.formatMoney"/>-->

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

@@ -192,6 +192,7 @@
                        selectionModel="single">
                 <a:fields>
                     <a:field name="enabled_flag" checkedValue="Y" uncheckedValue="N"/>
+                    <a:field name="sbo_bp_message" readOnly="true"/>
                 </a:fields>
             </a:dataSet>
         </a:dataSets>
@@ -215,7 +216,7 @@
                     <a:column name="bp_name" align="center" prompt="代理店名称" width="280"/>
                     <a:column name="extra_nam" align="center" prompt="代理店简称" width="130"/>
                     <a:column name="enabled_flag" align="center" prompt="代理店状态" width="100"/>
-
+                    <a:column name="sbo_bp_message" align="left" prompt="SBO反馈信息" width="100"/>
 <!--                    <a:column name="agent_instance_status_n" align="center" prompt="工作流状态" width="150"/>-->
                 </a:columns>
             </a:grid>