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

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

@@ -587,7 +587,19 @@
                     //自动带出籍贯
                     record.set('resident_addres', get_native_place(value))
                 }
-
+                if (name == 'id_no_sp') {
+                    if (!value) {
+                        record.set('ccx_resmsg1', '');
+                    }
+                    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))
+                }
             }
 
             var hls_bp_master_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
@@ -611,21 +623,21 @@
                 }
             }
 
-            if (ds.id == gird_ds_id4 || ds.id == gird_ds_id5) {
-                if (name == 'id_no_sp') {
-                    if (!value) {
-                        record.set('ccx_resmsg1', '');
-                    }
-                    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))
-                }
-            }
+            // if (ds.id == gird_ds_id4 || ds.id == gird_ds_id5) {
+            //     if (name == 'id_no_sp') {
+            //         if (!value) {
+            //             record.set('ccx_resmsg1', '');
+            //         }
+            //         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))
+            //     }
+            // }
             if(name=='marital_status'){
                 if(value=='30'){
                     record.getField('bp_name_sp').setRequired(true);