Merge branch 'feature/optimization' into develop

src/main/webapp/WEB-INF/classes/ccb/CCB600/con_contract_cashflow_query.lwm

@@ -56,7 +56,7 @@
                                   hls_ebank_batch_ln l
                              where g.status in ('NEW', 'DEAL')
                                and g.group_id = l.group_id
-                               and l.cashflow_id = t.cashflow_id)
+                               and l.cashflow_id = t.cashflow_id) and t.due_amount > 0
             ORDER BY t.due_date_ORDER, t.contract_id, t.times, decode(t.cf_item,1,2,8,3,9,1)
                 ]]></bm:query-sql>
         </bm:operation>

src/main/webapp/modules/ccb/CCB600/ccb_abc_import.lview

@@ -14,8 +14,9 @@
                         $jq('#general_importForm').attr('action',
                             '${/request/@context_path}/modules/ccb/CCB600/abc_upload.lview?batch_id=${/parameter/@batch_id}&user_id=${/session/@user_id}&_csrf=${/session/@_csrf.token}');
                     } else if ('${/parameter/@bank_type}' == 'CCB') {
+                        var due_date_to = new Date('${/parameter/@due_date_to}').format('yyyy-mm-dd');
                         $jq('#general_importForm').attr('action',
-                            '${/request/@context_path}/modules/ccb/CCB600/ccb_upload.lview?batch_id=${/parameter/@batch_id}&user_id=${/session/@user_id}&_csrf=${/session/@_csrf.token}');
+                            '${/request/@context_path}/modules/ccb/CCB600/ccb_upload.lview?batch_id=${/parameter/@batch_id}&due_date_to='+due_date_to+'&user_id=${/session/@user_id}&_csrf=${/session/@_csrf.token}');
                     }
                     document.getElementById('general_importForm').submit();
                 }

src/main/webapp/modules/ccb/CCB600/ccb_ebank_create.lview

@@ -149,6 +149,14 @@
             }
 
         }
+        function created_date(cell,date,text){
+            debugger;
+            v_date = new Date().format('yyyy-mm-dd');  //获取当前时间日期
+            v_dates = date.format('yyyy-mm-dd');  //页面中选择的时间日期
+            if(v_dates > v_date){    //比较当前时间和选择的时间
+                cell.disabled = true;   //不可选择打开
+            }
+        }
         ]]></script>
         <a:dataSets>
             <a:dataSet id="pay_methods_ds">
@@ -161,7 +169,7 @@
             <a:dataSet id="hls_ccb_form_query_ds">
                 <a:fields>
                     <a:field name="due_date_from" />
-                    <a:field name="due_date_to" defaultValue="${/model/create_date_path/record/@now_date}" />
+                    <a:field name="due_date_to" required="true" defaultValue="${/model/create_date_path/record/@now_date}" />
                     <a:field name="bp_agent_name" lovGridHeight="350" lovHeight="550" lovLabelWidth="50" lovWidth="550"
                              autoComplete="true" autoCompleteField="bp_agent_name"
                              lovService="basic.hls_bp_master_v_for_lov?bp_category=AGENT"
@@ -277,7 +285,7 @@
             </a:fieldSet>
             <a:fieldSet title="查询条件" column="3">
 <!--                <a:datePicker name="due_date_from" bindTarget="hls_ccb_form_query_ds" prompt="付款日期从"/>-->
-                <a:datePicker name="due_date_to" bindTarget="hls_ccb_form_query_ds" prompt="付款日期到"/>
+                <a:datePicker name="due_date_to" bindTarget="hls_ccb_form_query_ds" prompt="付款日期到" dayRenderer="created_date" />
                 <a:lov name="bp_agent_name" bindTarget="hls_ccb_form_query_ds" prompt="代理店"/>
                 <a:lov name="bp_tenant_name" bindTarget="hls_ccb_form_query_ds" prompt="客户名称"/>
                 <a:lov name="contract_number" bindTarget="hls_ccb_form_query_ds" prompt="合同号"/>

src/main/webapp/modules/ccb/CCB600/ccb_ebank_manager.lview

@@ -270,6 +270,7 @@
             }
             var str;
             var pay_method = record.get('pay_method');
+            var due_date_to = record.get('due_date');
             var bank_type;
             if (pay_method == 'CCB_THREE') {
                 bank_type = 'CCB';
@@ -284,7 +285,7 @@
             Leaf.showConfirm("提示", "该批次为<font color=red>" + str + "</font>划扣批次，是否导入<font color=red>" + str + "</font>回盘文件", function () {
                 var win = new Leaf.Window({
                     id: 'ccb_abc_upload_link_winId',
-                    url: $('ccb_abc_upload_link').getUrl() + '?batch_id=' + record.get('batch_id') + '&bank_type=' + bank_type,
+                    url: $('ccb_abc_upload_link').getUrl() + '?batch_id=' + record.get('batch_id') + '&bank_type=' + bank_type + '&due_date_to=' + due_date_to,
                     params: {
                         winId: 'ccb_abc_upload_link_winId'
                     },

src/main/webapp/modules/ccb/CCB600/ccb_upload.lview

@@ -71,7 +71,7 @@
         <a:dataSets>
             <a:dataSet id="ccb_form_ds" autoCreate="true">
                 <a:fields>
-                    <a:field name="transaction_date" required="true" prompt="建行划扣交易日期"/>
+                    <a:field name="transaction_date" defaultValue="${/parameter/@due_date_to}" required="true" prompt="建行划扣截止日期"/>
                 </a:fields>
             </a:dataSet>
         </a:dataSets>
@@ -82,7 +82,7 @@
                 <a:gridButton id="import_confirm_id" click="import_confirm" text="确认导入"/>
             </a:screenTopToolbar>
             <a:form column="1" labelWidth="120" marginWidth="30">
-                <a:datePicker name="transaction_date" bindTarget="ccb_form_ds" prompt="建行划扣交易日期"/>
+                <a:datePicker name="transaction_date" readOnly="true" bindTarget="ccb_form_ds" prompt="建行划扣交易日期"/>
             </a:form>
             <a:grid bindTarget="ccb_import_grid_ds" marginHeight="230" marginWidth="50" navBar="true">
                 <a:columns>

src/main/webapp/modules/hls/HLS530/manual_journal_create.lview

@@ -79,18 +79,18 @@
             }
             header_ds_record.set('reversed_flag', 'N');
 
-            if (name = 'document_type') {
-                Leaf.request({
-                    url: $('get_document_type_id').getUrl(),
-                    para: {
-                        document_type: document_type,
-                        //journal_header_id: '${/parameter/@journal_header_id}',
-                        journal_num: journal_num
-                    },
-                    success: periodname,
-                    scope: this
-                });
-            }
+            // if (name = 'document_type') {
+            //     Leaf.request({
+            //         url: $('get_document_type_id').getUrl(),
+            //         para: {
+            //             document_type: document_type,
+            //             //journal_header_id: '${/parameter/@journal_header_id}',
+            //             journal_num: journal_num
+            //         },
+            //         success: periodname,
+            //         scope: this
+            //     });
+            // }
         };
 
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {