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

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

@@ -7,6 +7,9 @@
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true"
           trace="true">
+    <a:init-procedure>
+    <a:model-query fetchAll="true" model="prj.PRJ500D.user_agent_description" rootPath="user_agent_description"/>
+    </a:init-procedure>
     <a:view>
         <a:link id="get_special_fields_link_id" model="cont.CON500.con_contract_get_special_fields"
                 modelaction="update"/>
@@ -25,6 +28,9 @@
 <!--        <a:link id="identity_query_link" model="interface.CCX_INTERFACE.identity_query" modelaction="update"/>-->
         <script type="text/javascript"><![CDATA[
         Leaf.onReady(function () {
+            var agent_name =  '${/model/user_agent_description/record/@bp_id}';
+            var agent_name_n = '${/model/user_agent_description/record/@bp_name}';
+
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
 
             var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
@@ -33,6 +39,9 @@
             var bp_record = $(bp_ds_id).getCurrentRecord();
             bp_record.set('bp_category','${/parameter/@bp_category}');
             bp_record.set('owner_user_id','${/session/@user_id}');
+            bp_record.set('agent_name', agent_name);
+            bp_record.set('agent_name_n', agent_name_n);
+
             if ('${/parameter/@bp_type}' == 'AGENT') {
                 bp_record.getField('agent_type_n').setReadOnly(false);
                 // bp_record.getField('agent_type_n').setRequired(true);
@@ -354,7 +363,7 @@
         }
 
         //保存前调用，生成商机编号
-        window['${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) {debugger;
+        window['${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) {
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
             var head_record = $(ds_id).getCurrentRecord();
             var bp_class = head_record.get('bp_class');
@@ -515,7 +524,7 @@
          scope: this
          });
          }; */
-        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {debugger;
+        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
             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';

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

@@ -6,6 +6,9 @@
     $Purpose: 商业伙伴维护
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+    <a:init-procedure>
+        <a:model-query fetchAll="true" model="prj.PRJ500D.user_agent_description" rootPath="user_agent_description"/>
+    </a:init-procedure>
     <a:view>
         <a:link id="bank_account_num_link" model="hls.HLS214.hls_bp_bank_account_num" modelaction="update"/>
         <a:link id="bp_agent_modify_link" url="${/request/@context_path}/modules/hls/HLS303/bp_agent_create.lview"/>
@@ -299,6 +302,12 @@
             var hls_bp_master_credit_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_credit');
             var bp_record = $(hls_bp_master_ds_id).getCurrentRecord();
             if ((ds.id).indexOf('hls_bp_master') != -1 && (ds.id).indexOf('F_BASIC') != -1) {
+
+                var agent_name =  '${/model/user_agent_description/record/@bp_id}';
+                var agent_name_n = '${/model/user_agent_description/record/@bp_name}';
+                record.set('agent_name', agent_name);
+                record.set('agent_name_n', agent_name_n);
+
                 if (name == 'agent_type') {
                     if (value == 'AGENT_NO_REBATE' || value == 'AGENT_EE') {
                         record.getField('parent_id_n').setReadOnly(false);