承租人表更评分代码整合

src/main/webapp/WEB-INF/classes/check_after_save_bm/check_prj_lease_item.lwm

 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    $Author: lijingjing
-    $Date: 2018-11_03 上午11:00:06  
-    $Revision: 3.0  
-    $Purpose: 
--->
+        <!--
+            $Author: lijingjing
+            $Date: 2018-11_03 上午11:00:06
+            $Revision: 3.0
+            $Purpose:
+        -->
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
-    <bm:operations>
-        <bm:operation name="update">
-            <bm:update-sql><![CDATA[
+<bm:operations>
+    <bm:operation name="update">
+        <bm:update-sql><![CDATA[
                 begin
                     prj_project_check_pkg.check_prj_lease_item(
+                    p_project_id =>${@project_id},
                     p_machine_number =>${@machine_number},
                     p_user_id => ${/session/@user_id}
                     );
                 end;
             ]]></bm:update-sql>
-        </bm:operation>
+    </bm:operation>
 
-    </bm:operations>
+</bm:operations>
 </bm:model>

src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview

@@ -384,15 +384,29 @@
             }
             if (bp_tenant_detail_r && ds.id == prj_project_ds_id) {
                 for (var key in bp_tenant_detail_r.data) {
-                    if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id'&& key != 'contract_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'third_guar_score' ) {
-                        if(!bp_tenant_detail_r.get(key)){
-                            Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
-                            bp_rate_flag = false;
-                            break;
-                        }else{
-                            bp_rate_flag = true;
+                    if(division!='70'){
+                        //非铁甲排除铁甲必填
+                        if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id'&& key != 'contract_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'third_guar_score'&& key != 'tj_score' ) {
+                            if(!bp_tenant_detail_r.get(key)){
+                                Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
+                                bp_rate_flag = false;
+                                break;
+                            }else{
+                                bp_rate_flag = true;
+                            }
+                        }
+                    }else{
+                        if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id'&& key != 'contract_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'third_guar_score' ) {
+                            if(!bp_tenant_detail_r.get(key)){
+                                Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
+                                bp_rate_flag = false;
+                                break;
+                            }else{
+                                bp_rate_flag = true;
+                            }
                         }
                     }
+
                 }
             }
             if(!bp_rate_flag){
@@ -443,7 +457,7 @@
             window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
             if (name == 'attachment') {
                 link_function = 'prj501n_upload_file';
-                if(record.get('cdd_item') == 'ADD_ATTACH'){
+                if(record.get('cdd_item') == 'ADD_ATTACH'||record.get('cdd_item') == 'TJ_SCORE_SHEET'){
                     link_function = 'prj501n_upload_file_new';
                 }
                 return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
@@ -730,9 +744,18 @@
                     document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'none';
                     record.getField('deduction_limit').setRequired(false);
                 }
+                document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
+                document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
+            }
+
+            //add by wangwei 非铁甲业务隐藏铁甲评分
+            var bp_tenant_rate_detail_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'bp_tenant_rate_detail');
+            if (bp_tenant_rate_detail_ds_id == ds.id && bp_tenant_rate_detail_ds_id) {
+                if (division != '70' && division != '') {
+                    document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE_prompt').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE').style.display = 'none';
+                }
             }
-            document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
-            document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
         };
 
         //更新时调用

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview

@@ -1129,6 +1129,10 @@
             }
             var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
             if (score_ds_id == ds.id) {
+                if (division != '70' && division != '') {
+                    document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE_prompt').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE').style.display = 'none';
+                }
                 if (!record.get('score_name')) {
                     if ($(ds_id).getCurrentRecord()) {
                         var score_name = $(ds_id).getCurrentRecord().get('legal_person') || $(ds_id).getCurrentRecord().get('bp_id_tenant_n');
@@ -1280,13 +1284,24 @@
             var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord();
             if (bp_tenant_detail_r) {
                 for (var key in bp_tenant_detail_r.data) {
-                    if (key != 'bp_detail_id' && key != 'score_name'&& key != 'contract_id' && key != 'bp_age' && key != 'project_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'third_guar_score' ) {
-                        //if (!bp_tenant_detail_r.get(key)) {
-                        if (typeof bp_tenant_detail_r.get(key) == "null" || typeof bp_tenant_detail_r.get(key) == "undefined" || bp_tenant_detail_r.get(key) === "") {
-                            Leaf.showInfoMessage("提示", "承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
-                            return;
+                    if(division!='70'){
+                        if (key != 'bp_detail_id' && key != 'score_name'&& key != 'contract_id' && key != 'bp_age' && key != 'project_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'third_guar_score'&& key != 'tj_score' ) {
+                            //if (!bp_tenant_detail_r.get(key)) {
+                            if (typeof bp_tenant_detail_r.get(key) == "null" || typeof bp_tenant_detail_r.get(key) == "undefined" || bp_tenant_detail_r.get(key) === "") {
+                                Leaf.showInfoMessage("提示", "承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
+                                return;
+                            }
+                        }
+                    }else{
+                        if (key != 'bp_detail_id' && key != 'score_name'&& key != 'contract_id' && key != 'bp_age' && key != 'project_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'third_guar_score' ) {
+                            //if (!bp_tenant_detail_r.get(key)) {
+                            if (typeof bp_tenant_detail_r.get(key) == "null" || typeof bp_tenant_detail_r.get(key) == "undefined" || bp_tenant_detail_r.get(key) === "") {
+                                Leaf.showInfoMessage("提示", "承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
+                                return;
+                            }
                         }
                     }
+
                 }
             }
             if (current_record.dirty == true) {
@@ -1610,14 +1625,27 @@
             }
             if (bp_tenant_detail_r && ds.id == prj_project_ds_id) {
                 for (var key in bp_tenant_detail_r.data) {
-                    if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age'&& key != 'contract_id' && key != 'project_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'third_guar_score') {
-                        //if (!bp_tenant_detail_r.get(key)) {
-                        if (typeof bp_tenant_detail_r.get(key) == "null" || typeof bp_tenant_detail_r.get(key) == "undefined" || bp_tenant_detail_r.get(key) === "") {
-                            Leaf.showInfoMessage("提示", "承租人评分信息区域的所有字段，除\"第三方担保附件得分\"外，其他都为必输字段，请填写！");
-                            bp_rate_flag = false;
-                            break;
-                        } else {
-                            bp_rate_flag = true;
+                    if(division != '70'){
+                        if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age'&& key != 'contract_id' && key != 'project_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'third_guar_score'&&key != 'tj_score') {
+                            //if (!bp_tenant_detail_r.get(key)) {
+                            if (typeof bp_tenant_detail_r.get(key) == "null" || typeof bp_tenant_detail_r.get(key) == "undefined" || bp_tenant_detail_r.get(key) === "") {
+                                Leaf.showInfoMessage("提示", "承租人评分信息区域的所有字段，除\"第三方担保附件得分\"外，其他都为必输字段，请填写！");
+                                bp_rate_flag = false;
+                                break;
+                            } else {
+                                bp_rate_flag = true;
+                            }
+                        }
+                    }else{
+                        if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age'&& key != 'contract_id' && key != 'project_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'third_guar_score') {
+                            //if (!bp_tenant_detail_r.get(key)) {
+                            if (typeof bp_tenant_detail_r.get(key) == "null" || typeof bp_tenant_detail_r.get(key) == "undefined" || bp_tenant_detail_r.get(key) === "") {
+                                Leaf.showInfoMessage("提示", "承租人评分信息区域的所有字段，除\"第三方担保附件得分\"外，其他都为必输字段，请填写！");
+                                bp_rate_flag = false;
+                                break;
+                            } else {
+                                bp_rate_flag = true;
+                            }
                         }
                     }
                 }

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview

@@ -326,16 +326,30 @@
             }
             if (bp_tenant_detail_r && ds.id == prj_project_ds_id) {
                 for (var key in bp_tenant_detail_r.data) {
-                    if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' &&  key != 'project_id'&& key != 'third_party_credibility' && key != 'third_party_credibility_n') {
-                        //if(!bp_tenant_detail_r.get(key)){
-                        if (typeof bp_tenant_detail_r.get(key)== "null"||typeof bp_tenant_detail_r.get(key)== "undefined"|| bp_tenant_detail_r.get(key)=== "") {
-                            Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方信用度\"外，其他都为必输字段，请填写！");
-                            bp_rate_flag = false;
-                            break;
-                        }else{
-                            bp_rate_flag = true;
+                    if(division!='70'){
+                        if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' &&  key != 'project_id'&& key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'contract_id'&& key != 'third_guar_score'&&key != 'tj_score') {
+                            //if(!bp_tenant_detail_r.get(key)){
+                            if (typeof bp_tenant_detail_r.get(key)== "null"||typeof bp_tenant_detail_r.get(key)== "undefined"|| bp_tenant_detail_r.get(key)== "") {
+                                Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
+                                bp_rate_flag = false;
+                                break;
+                            }else{
+                                bp_rate_flag = true;
+                            }
+                        }
+                    } else{
+                        if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' &&  key != 'project_id'&& key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'contract_id'&& key != 'third_guar_score') {
+                            //if(!bp_tenant_detail_r.get(key)){
+                            if (typeof bp_tenant_detail_r.get(key)== "null"||typeof bp_tenant_detail_r.get(key)== "undefined"|| bp_tenant_detail_r.get(key)== "") {
+                                Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
+                                bp_rate_flag = false;
+                                break;
+                            }else{
+                                bp_rate_flag = true;
+                            }
                         }
                     }
+
                 }
             }
             if(!bp_rate_flag){
@@ -541,15 +555,18 @@
             var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
             if(lease_item_ds_id == ds.id &&lease_item_ds_id){
                 var gridId= ds.bindname+'_layout_grid_id';
-                if(division=='70'){
+                if(division=='70'&&division!=''){
                     debugger;
                     if(record!=''){
                         record.getField('lease_name_n').setRequired(true);
                         record.getField('brand_value').setRequired(true);
+                        record.getField('produce_date').setReadOnly(false);
                         record.getField('produce_date').setRequired(true);
                         record.getField('using_hour').setRequired(true);
                         record.getField('modelcd').setReadOnly(false);
                         record.getField('modelcd').setRequired(true);
+                        record.getField('ownership_flag_n').setRequired(true);
+                        record.getField('residual_value_amount').setRequired(true);
                         record.getField('full_name').setRequired(false);
                         record.getField('full_name_n').setRequired(false);
                     }else {
@@ -562,7 +579,7 @@
                     $(gridId).hideColumn('item_type_n');
                     $(gridId).hideColumn('equipment_type_n');
                     $(gridId).hideColumn('machine_number');
-                }else {
+                }else if(division!=''){
                     $(gridId).hideColumn('machine_number_70');
                     $(gridId).hideColumn('lease_name_n');
                     $(gridId).hideColumn('brand_value');
@@ -772,9 +789,16 @@
         }
         var division='';
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
-           debugger;
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
             var prj_quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
+            //add by wangwei 非铁甲业务隐藏铁甲评分
+            var bp_tenant_rate_detail_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'bp_tenant_rate_detail');
+            if (bp_tenant_rate_detail_ds_id == ds.id && bp_tenant_rate_detail_ds_id) {
+                if (division != '70' && division != '') {
+                    document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE_prompt').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE').style.display = 'none';
+                }
+            }
             if (ds_id == ds.id && ds_id) {
                 division=record.get('division');
                 if (record.get('pay_method') == 'WIRE_TRANSFER') {
@@ -993,15 +1017,20 @@
                 if(division=='70'){
                     record.getField('lease_name_n').setRequired(true);
                     record.getField('brand_value').setRequired(true);
+                    record.getField('produce_date').setReadOnly(false);
                     record.getField('produce_date').setRequired(true);
+                    record.getField('using_hour').setRequired(true);
                     record.getField('machine_number_70').setRequired(true);
-                   record.getField('using_hour').setRequired(true);
                     record.getField('modelcd').setReadOnly(false);
                     record.getField('modelcd').setRequired(true);
                     record.getField('full_name').setRequired(false);
                     record.getField('full_name_n').setRequired(false);
+                    record.getField('ownership_flag_n').setRequired(true);
+                    record.getField('residual_value_amount').setRequired(true);
                     if(name=='lease_name_n'){
                         record.data.type_name=value;
+                    }else if(name=='modelcd'){
+                        record.data.pattern=value;
                     }
                 }else {
                     record.getField('modelcd').setReadOnly(true);
@@ -1185,6 +1214,15 @@
                         record.set('bp_age', jsGetAge(value.format('yyyy-mm-dd').toString()));
                     }
                 }
+                if(name=='third_guar_score'&&!Ext.isEmpty(value)){
+                    if(value<0||value>10){
+                        setTimeout(function () {
+                            record.set('third_guar_score', '');
+                        }, 0);
+                        Leaf.showInfoMessage("提示", "第三方担保附件分数范围为0-10，请重新输入！");
+
+                    }
+                }
             }
             var device_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_SCORE_DEVICE', 'bp_tenant_rate_item');
             if (device_ds_id == ds.id) {