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

src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify.lview

@@ -25,7 +25,7 @@
         <!--                type="text/javascript"></script>-->
         <script type="text/javascript"><![CDATA[
         //保存前调用
-        // window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function(ds, record) {
+        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function(ds, record) {
         //     window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
         //     var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
         //     debugger
@@ -40,7 +40,22 @@
         //             return;
         //         }
         //     }
-        // };
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
+            var bp_record = $(ds_id).getCurrentRecord();
+            if(old_id_card != new_id_card){
+                bp_record.set('id_card_no_change_flag','Y');
+            }else{
+                bp_record.set('id_card_no_change_flag','N');
+            }
+
+
+            if(old_bp_name != new_bp_name){
+                bp_record.set('bp_name_change_flag','Y');
+            }else{
+                record.set('bp_name_change_flag','N');
+            }
+            window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+        };
 
 
         function CheckSocialCreditCode(Code) {
@@ -81,15 +96,13 @@
 
         //保存submitsuccess调用
         window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function(ds, record, res, bp_seq) {
-            window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-
+            window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');
             var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
             var records = $(ds_id);
             if (!(records == 'undefined' || records == null)) {
                 $(ds_id).query();
             }
-
             // 简称校验
             // debugger;
             // var Pattern = /^[A-Za-z]+$/;
@@ -101,22 +114,6 @@
             //     }
             // }
 
-            var bp_record = $(bp_ds_id).getCurrentRecord();
-
-            if(old_id_card != new_id_card){
-                record.set('id_card_no_change_flag','Y');
-            }else{
-                record.set('id_card_no_change_flag','N');
-            }
-
-
-            if(old_bp_name != new_bp_name){
-                record.set('bp_name_change_flag','Y');
-            }else{
-                record.set('bp_name_change_flag','N');
-            }
-
-
             // Leaf.request({
             //     url: $('hls214_sap_eai_create_customer_link').getUrl(),
             //     para: {