Merge branch 'refs/heads/feature/email_intreface' into develop

src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql

@@ -142,6 +142,6 @@ INSERT INTO sys_function_dynamic
    creation_date,
    created_by,
    last_update_date,
-   last_updated_by)
+   last_updated_by )
 VALUES
   ('HLS36105', '商业伙伴授信维护', 1, SYSDATE, -1, SYSDATE, -1);
\ No newline at end of file

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

@@ -67,6 +67,13 @@
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
             window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
             var ds_id1 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_case_record');
+            var reduce_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_penalty_reduce');
+            if($(reduce_ds_id).data.length<1){
+                $L.showInfoMessage('提示','请维护罚息减免信息！')
+                window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                return;
+            }
+
             if(!$(ds_id1).validate()){
                 window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 return;
@@ -124,6 +131,7 @@
 
         function getXml() {
             var req_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_case_record');
+            var reduce_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_penalty_reduce');
             var req_record = $(req_ds_id).getAt(0);
             var record_id = req_record.data.record_id
             if (!record_id) {
@@ -132,10 +140,19 @@
                 return;
             }
            //检验必须字段
+            var records=$(reduce_ds_id).data;
+            for(var i=0;i<records.length;i++){
+                //如果没有进行测算，
+               if( records[i].get('calc_flag')!='Y'){
+                   Leaf.showMessage('${l:HLS.PROMPT}', '所有数据测算后才能提交！');
+                   window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                   return;
+               }
+            }
+
+
 
-            /*小额不用审批直接通过*/
-            //将小额审批改为工作工作流审批
-            //所有的单据都默认为小额审批
+           //判断所有的单据是否已经进行测算过
             Leaf.request({
                 url: $('con_contract_penalty_reduction_link').getUrl(),
                 para: {

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

@@ -20,6 +20,8 @@
             window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
             var ds_id1 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_penalty_reduce');
             var record1 = $(ds_id1).getCurrentRecord();
+
+
             Leaf.request({
                 url: '${/request/@context_path}/autocrud/cont.CON1020.con_contract_penalty_info_save/execute',
                 para: {
@@ -129,6 +131,12 @@
             window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
             var ds_id1 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_penalty_reduce');
             var record1 = $(ds_id1).getCurrentRecord();
+
+            if( record1.get('reduce_amount_total')<0){
+                $L.showInfoMessage('提示','罚息减免总金额不能小于0');
+                window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                return;
+            }
             Leaf.request({
                 url: '${/request/@context_path}/autocrud/cont.CON1020.con_contract_penalty_info_save/execute',
                 para: {