[fix]商业伙伴修改

src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_finish_for_query.lwm

@@ -60,7 +60,7 @@
     </bm:query-fields>
     <bm:data-filters>
         <bm:field name="is_terminate" expression="((select sum(ccc.due_amount) from con_contract_cashflow ccc where contract_id = t1.contract_id and cf_item = 1) - (select sum(ccc.received_amount) from con_contract_cashflow ccc where contract_id = t1.contract_id and cf_item = 1)) = 0"/>
-<!--        <bm:data-filter enforceOperations="query" expression="t1.contract_status not in (&apos;TERMINATING&apos;,&apos;CLOSED&apos;) "/>-->
+        <bm:data-filter enforceOperations="query" expression="t1.contract_status not in (&apos;CLOSED&apos;) "/>
         <!--         <bm:data-filter enforceOperations="query" expression="t1.lease_end_date &lt;= sysdate"/> -->
         <bm:data-filter enforceOperations="query" expression="t1.data_class = &apos;NORMAL&apos;"/>
 <!--        <bm:data-filter enforceOperations="query" expression="t1.contract_id = ${@contract_id}"/>-->

src/main/webapp/WEB-INF/classes/hls/HLS214N/hls_bp_master_modify_user.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+                select ee.employee_type_id
+                from exp_employees ee
+                where ee.employee_id =
+                (select su.employee_id
+                from sys_user su
+                where su.user_id = ${/session/@user_id})
+                ]]>
+            </bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

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

@@ -8,6 +8,7 @@
 <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:model-query fetchAll="true" model="hls.HLS214N.hls_bp_master_modify_user" rootPath="modify_user"/>
     </a:init-procedure>
     <a:view>
         <a:link id="bank_account_num_link" model="hls.HLS214.hls_bp_bank_account_num" modelaction="update"/>
@@ -231,9 +232,20 @@
                 // }
             // }
             if ((ds.id).indexOf('hls_bp_master') != -1 && (ds.id).indexOf('F_BASIC') != -1) {
+
+                var employee_type_id = '${/model/modify_user/record/@employee_type_id}';
+
                 if (record.get('bp_category') == 'VENDER') {
-                    record.getField('agent_name_n').setReadOnly(true);
+                    record.getField('unit_id_n').setReadOnly(true);
+                }
+                if(employee_type_id == '64'){
+                    record.getField('unit_id_n').setReadOnly(true);
+                    record.getField('unit_id_n').setRequired(false);
+                }else{
+                    record.getField('unit_id_n').setReadOnly(false);
+                    record.getField('unit_id_n').setRequired(true);
                 }
+
             }
         };
 
@@ -307,11 +319,6 @@
             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);