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

src/main/resources/spring/standardSecurity.xml

@@ -106,8 +106,8 @@
         <!-- <authentication-provider ref="ldapAuthProvider" />-->
         <!--标准登录验证-->
         <!--生成开发此处不同 add chenlingfeng for ds-->
-        <authentication-provider user-service-ref="customUserDetailsService">
-        <!--<authentication-provider user-service-ref="leafUserDetailsService">-->
+        <!--<authentication-provider user-service-ref="customUserDetailsService">-->
+        <authentication-provider user-service-ref="leafUserDetailsService">
             <password-encoder ref="passwordManager"/>
         </authentication-provider>
     </authentication-manager>

src/main/webapp/WEB-INF/classes/sys/sys_user.lwm

@@ -5,6 +5,7 @@
         <ns1:field name="user_name" databaseType="VARCHAR" datatype="java.lang.String" prompt="SYS_USER.ACCOUNT"/>
         <ns1:field name="encrypted_foundation_password" databaseType="VARCHAR" datatype="java.lang.String" forSelect="false" insertExpression="sys_login_pkg.md5(${@password})"/>
         <ns1:field name="encrypted_user_password" databaseType="VARCHAR" datatype="java.lang.String" forSelect="false" insertExpression="sys_login_pkg.md5(${@confirm_password})"/>
+        <ns1:field name="password_encrypted" databaseType="VARCHAR" datatype="java.lang.String" forSelect="false" insertExpression="sys_login_pkg.md5(${@confirm_password})"/>
         <ns1:field name="start_date" databaseType="DATE" datatype="java.sql.Date" forInsert="true" forUpdate="true" prompt="HAP_START_DATE"/>
         <ns1:field name="end_date" databaseType="DATE" datatype="java.sql.Date" forInsert="true" forUpdate="true" prompt="HAP_END_DATE"/>
         <ns1:field name="last_logon_date" databaseType="DATE" datatype="java.sql.Date" forInsert="true" forUpdate="true"/>

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

@@ -77,7 +77,6 @@
             if(!$(ds_id1).validate()){
                 window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 return;
-
              }
 
             var record1 = $(ds_id1).getCurrentRecord();

src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview

@@ -363,7 +363,7 @@
             //alert('${/parameter/@unbrand}');
             if (bp_class == 'NP') {
 
-                if (card_identity_flag == 'N' || sp_identity_flag == 'N') {
+                // if (card_identity_flag == 'N' || sp_identity_flag == 'N') {
                     //if (regax.test(extra_nam) && extra_nam.length == 3) {
                         window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
                         var check_flag = false;
@@ -407,22 +407,18 @@
                 //         window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 //         return false;
                 //     }
-                } else {
-                    Leaf.showMessage('${l:HLS.PROMPT}', '身份证校验未通过，不能保存!');
-                    window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                    return false;
-                }
+                // } else {
+                //     Leaf.showMessage('${l:HLS.PROMPT}', '身份证校验未通过，不能保存!');
+                //     window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                //     return false;
+                // }
             } else {
                 window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
                 var check_flag = false;
                 if (head_record.get('bp_code')) {
                     return true;
                 }
-                if (!CheckSocialCreditCode(social_code)) {
-                    Leaf.showMessage('提示', '统一社会信用代码有误，请重新输入！');
-                    window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                    return false;
-                }
+
                 Leaf.request({
                     url: $('get_special_fields_link_id').getUrl(),
                     para: {
@@ -518,11 +514,13 @@
          scope: this
          });
          }; */
-        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
+        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {debugger;
             var f_bp_create_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
             var gird_ds_id = 'BP_NP_CREATE_BP_ASSETS01_hls_bp_assets_ds';
             var gird_ds_id2 = 'BP_NP_CREATE_BP_ASSETS04_hls_bp_assets_ds';
             var gird_ds_id3 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_bank_flow');
+            var gird_ds_id4 = 'BP_NP_CREATE_F_SPOUSE_1_hls_bp_master_ds';
+            var gird_ds_id5 = 'BP_NP_CREATE_F_SPOUSE_hls_bp_master_ds';
             if (gird_ds_id == ds.id || gird_ds_id2 == ds.id) {
                 if (name == 'relationship_with_bp') {
                     if (value == 'A7501') {
@@ -558,18 +556,6 @@
                         record.getField('parent_id_n').setReadOnly(true);
                     }
                 }
-                if (name == 'marital_status') {
-                    if (value == '30') {
-                        record.getField('bp_name_sp').setRequired(true);
-                        // record.getField('card_type_sp').setRequired(true);
-                        record.getField('id_no_sp').setRequired(true);
-                    }
-                }
-            }
-
-            var hls_bp_master_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
-            if (ds.id == hls_bp_master_ds_id && hls_bp_master_ds_id) {
-//
                 if (name == 'id_card_no') {
                     // record = $(hls_bp_master_ds_id).getCurrentRecord();
                     // var id_num = record.get('id_card_no');
@@ -578,21 +564,58 @@
                     if (!value) {
                         record.set('ccx_resmsg', '');
                     }
-                    ds.fields.id_card_no.pro.validator = id_card_no_validate;
+                    if(record.get('id_type') == 'ID_CARD'){
+                        if (!checkCard(value)) {
+                            Leaf.showMessage('${l:HLS.PROMPT}','个人身份证号错误!');
+                            return false;
+                        }
+                    }
+
+                    // ds.fields.id_card_no.pro.validator = id_card_no_validate;
                     //自动带出籍贯
                     record.set('resident_addres', get_native_place(value))
                 }
 
+            }
+
+            var hls_bp_master_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
+            if (ds.id == hls_bp_master_ds_id && hls_bp_master_ds_id) {
+                if (name == 'id_card_no_leg') {
+                    if (!value) {
+                        record.set('ccx_resmsg1', '');
+                    }
+                    var id_card_no_leg = record.get('id_card_no_leg');
+                    if (!checkCard(id_card_no_leg)) {
+                        Leaf.showMessage('${l:HLS.PROMPT}','法人代表身份证号格式错误!');
+                        return false;
+                    }
+                }
+                if(name == 'social_code') {
+                    if (!CheckSocialCreditCode(value)) {
+                        Leaf.showMessage('提示', '统一社会信用代码有误，请重新输入！');
+                        // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                        return false;
+                    }
+                }
+            }
+
+            if (ds.id == gird_ds_id4 || ds.id == gird_ds_id5) {
                 if (name == 'id_no_sp') {
                     if (!value) {
                         record.set('ccx_resmsg1', '');
                     }
-                    ds.fields.id_no_sp.pro.validator = id_card_no_validate;
+                    if(record.get('card_type_sp') == 'ID_CARD'){
+                        if (!checkCard(value)) {
+                            Leaf.showMessage('${l:HLS.PROMPT}','配偶身份证号错误!');
+                            return false;
+                        }
+                    }
+                    // ds.fields.id_no_sp.pro.validator = id_card_no_validate;
                     record.set('resident_addres_sp', get_native_place(value))
                 }
+            }
 
 
-            }
 
 
         };

src/main/webapp/modules/hls/HLS361N/credit_credit.lview

@@ -37,6 +37,16 @@ $Purpose: 商业伙伴授信创建
 
         };
 
+        //保存成功后刷新页面credit_ds
+        // window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function(ds, record, res, bp_seq) {
+        //     Leaf.SideBar.show({
+        //         msg: '操作成功',
+        //         duration: 2000
+        //     });
+        //     $('credit_ds').query();
+        //     $('${/parameter/@winid}').close();
+        //     window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+        // };
 
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>

src/main/webapp/modules/hls/HLS361N/credit_credit_maintain.lview

@@ -59,6 +59,8 @@ $Purpose: 商业伙伴授信维护
                 success: function ()  {
 
                     window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                    $('${/parameter/@winid}').close();
+                    $('credit_ds').query();
 
                 },
                 error: function() {

src/main/webapp/modules/hls/HLS361N/hls_bp_master_credit.lview

@@ -102,7 +102,9 @@ $Purpose: 商业伙伴授信维护
             param['credit_date_from']=datas[0].get('credit_date_from');
             param['credit_total_amount']=datas[0].get('credit_total_amount');
             param['bp_code']=datas[0].get('bp_code');
-            hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_maintain_link', null);
+            param['winid']='hls_bp_credit_winId';
+
+            hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_maintain_link', credit_ds);
 
 
            /* var credit_date_from=Leaf.formatDate(datas[0].data.credit_date_from)
@@ -160,12 +162,14 @@ $Purpose: 商业伙伴授信维护
         }
         //商业伙伴创建按钮
         window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
+            var credit_ds=get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_credit_hd');
             var param={};
             param['function_code'] = 'HLS36105';
             param['function_usage'] = 'MODIFY';
             param['maintain_type'] = 'UPDATE';
             param['url_title'] = '商业伙伴授信维护';
-            hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_create_link', null);
+            param['winid']='hls_bp_create_winid';
+            hls_doc_get_layout_code('hn1150_get_layout_code_link_id', param, 'hls361_hls_bp_master_create_link', credit_ds);
         }
         //--承租人的详细信息
         function on_business_tenant_detail_window(id, name) {