高空车&叉车改造

d79b4013 · wangwei5743 · 1d28d0a3 · d79b4013 · d79b4013 · d79b4013
Commit d79b4013 authored Dec 23, 2021 by wangwei5743
5 changed files
--- a/src/main/webapp/WEB-INF/classes/check_after_save_bm/check_prj_lease_item.lwm
+++ b/src/main/webapp/WEB-INF/classes/check_after_save_bm/check_prj_lease_item.lwm
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+        <!--
-    $Author: lijingjing
+            $Author: lijingjing
-    $Date: 2018-11_03 上午11:00:06  
+            $Date: 2018-11_03 上午11:00:06
-    $Revision: 3.0  
+            $Revision: 3.0
-    $Purpose: 
+            $Purpose:
-->
+        -->
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
-    <bm:operations>
+<bm:operations>
-        <bm:operation name="update">
+    <bm:operation name="update">
-            <bm:update-sql><![CDATA[
+        <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>
--- a/src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
+++ b/src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
@@ -11,7 +11,7 @@
        <!-- <a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" model="prj.PRJ500D.sys_user_lv" rootPath="user_name_path"/> -->
        <a:model-query fetchAll="true" model="hls.HLS303.hls_bp_agentemployee_id" rootPath="employee_id_path"/>
        <a:model-query fetchAll="true" model="prj.PRJ500D.amount_check" rootPath="amount_check"/>
-        <a:model-query defaultWhereClause="v.role_id = ${/session/@role_id} and v.role_code in (&apos;HAND&apos;,&apos;0017&apos;)" model="zjwfl.sys_role_flag" rootPath="role_flag_path"/>
+        <a:model-query defaultWhereClause="v.role_id = ${/session/@role_id} and v.role_code in (&apos;HAND&apos;,&apos;0017&apos;,&apos;0019&apos;)" model="zjwfl.sys_role_flag" rootPath="role_flag_path"/>
        <a:model-query fetchAll="true" model="prj.PRJ500D.user_agent_description" rootPath="user_agent_description"/>
        <a:model-query fetchAll="true" model="prj.PRJ500D.prj_project_get_description" rootPath="description"/>
        <s:server-script import="contract_print_path.js"><![CDATA[
@@ -292,7 +292,11 @@
                if('${/model/role_flag_path/record/@sys_role_flag}' == 'Y') {
                    url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
                }else{
-                    url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                    if (query_only == 'Y' || '${/parameter/@function_usage}' == 'QUERY') {
+                        url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                    } else {
+                        url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                    }
                }
                var win = new Leaf.Window({
                    url: url,
@@ -384,15 +388,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(division!='70'){
-                        if(!bp_tenant_detail_r.get(key)){
+                        //非铁甲排除铁甲必填
-                            Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
+                        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' ) {
-                            bp_rate_flag = false;
+                            if(!bp_tenant_detail_r.get(key)){
-                            break;
+                                Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
-                        }else{
+                                bp_rate_flag = false;
-                            bp_rate_flag = true;
+                                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 +461,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>';
@@ -695,11 +713,10 @@
                //获取员工类型
                var description = '${/model/description/record/@employee_type_code}';
                var bp_code='${/model/user_agent_description/record/@bp_code}';
-                if(division=='80'){
+                if(division=='80'||division=='30'||division=='50'){
                    record.set('credit_line','TENANT');
                    record.set('credit_line_n','承租人');
-                }
+                }else if(!Ext.isEmpty(description) && description == 'AGENT'){
-                if(!Ext.isEmpty(description) && description == 'AGENT'){
                    if(!Ext.isEmpty(bp_code)){
                        if(bp_code !== 'C00010180' && bp_code !== 'C00010175' && bp_code !== 'C00010176' && bp_code !== 'C00010187'){
                            if(bp_code =='D00010001'){
@@ -733,6 +750,15 @@
                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';
+                }
+            }
        };
        //更新时调用

--- a/src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
+++ b/src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
@@ -11,7 +11,7 @@
        <a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" model="prj.PRJ500D.sys_user_lv"
                       rootPath="user_name_path"/>
        <a:model-query
-                defaultWhereClause="v.role_id = ${/session/@role_id} and v.role_code in (&apos;HAND&apos;,&apos;0017&apos;)"
+                defaultWhereClause="v.role_id = ${/session/@role_id} and v.role_code in (&apos;HAND&apos;,&apos;0017&apos;,&apos;0019&apos;)"
                model="zjwfl.sys_role_flag" rootPath="role_flag_path"/>
        <a:model-query fetchAll="true" model="prj.PRJ500D.user_agent_description" rootPath="user_agent_description"/>
        <a:model-query fetchAll="true" model="prj.PRJ500D.prj_project_get_description" rootPath="description"/>
@@ -367,7 +367,12 @@
                if ('${/model/role_flag_path/record/@sys_role_flag}' == 'Y') {
                    url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
                } else {
-                    url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                    if (query_only == 'Y' || '${/parameter/@function_usage}' == 'QUERY') {
+                        url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                    } else {
+                        url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                    }
                }
                var win = new Leaf.Window({
                    url: url,
@@ -435,7 +440,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>';
@@ -1025,11 +1030,10 @@
                var description = '${/model/description/record/@employee_type_code}';
                var bp_code='${/model/user_agent_description/record/@bp_code}';
                var credit_record = $(ds_id).getCurrentRecord();
-                if(division=='80'){
+                if(division=='80'||division=='30'||division=='50'){
                    credit_record.set('credit_line','TENANT');
                    credit_record.set('credit_line_n','承租人');
-                }
+                }else if(!Ext.isEmpty(description) && description == 'AGENT'){
-                if(!Ext.isEmpty(description) && description == 'AGENT'){
                    if(!Ext.isEmpty(bp_code)){
                        if(bp_code !== 'C00010180' && bp_code !== 'C00010175' && bp_code !== 'C00010176' && bp_code !== 'C00010187'){
                            if(bp_code =='D00010001'){
@@ -1127,7 +1131,12 @@
            }
            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');
                        record.set('score_name', score_name);
@@ -1276,13 +1285,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(division!='70'){
-                        //if (!bp_tenant_detail_r.get(key)) {
+                        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 (typeof bp_tenant_detail_r.get(key) == "null" || typeof bp_tenant_detail_r.get(key) == "undefined" || bp_tenant_detail_r.get(key) === "") {
+                            //if (!bp_tenant_detail_r.get(key)) {
-                            Leaf.showInfoMessage("提示", "承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
+                            if (typeof bp_tenant_detail_r.get(key) == "null" || typeof bp_tenant_detail_r.get(key) == "undefined" || bp_tenant_detail_r.get(key) === "") {
-                            return;
+                                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) {
@@ -1606,16 +1626,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 != 'contract_id' && key != 'project_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'third_guar_score') {
+                    if(division != '70'){
-                        //if (!bp_tenant_detail_r.get(key)) {
+                        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 (typeof bp_tenant_detail_r.get(key) == "null" || typeof bp_tenant_detail_r.get(key) == "undefined" || bp_tenant_detail_r.get(key) === "") {
+                            //if (!bp_tenant_detail_r.get(key)) {
-                            Leaf.showInfoMessage("提示", "承租人评分信息区域的所有字段，除\"第三方担保附件得分\"外，其他都为必输字段，请填写！");
+                            if (typeof bp_tenant_detail_r.get(key) == "null" || typeof bp_tenant_detail_r.get(key) == "undefined" || bp_tenant_detail_r.get(key) === "") {
-                            bp_rate_flag = false;
+                                Leaf.showInfoMessage("提示", "承租人评分信息区域的所有字段，除\"第三方担保附件得分\"外，其他都为必输字段，请填写！");
-                            break;
+                                bp_rate_flag = false;
-                        } else {
+                                break;
-                            bp_rate_flag = true;
+                            } 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;
+                            }
                        }
                    }
                }
            }
            if (!bp_rate_flag) {

--- a/src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_readonly.lview
+++ b/src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_readonly.lview
@@ -10,7 +10,7 @@
    <a:init-procedure>
        <a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" model="prj.PRJ500D.sys_user_lv"
                       rootPath="user_name_path"/>
-        <a:model-query defaultWhereClause="v.role_id = ${/session/@role_id} and v.role_code in (&apos;HAND&apos;,&apos;0017&apos;)" model="zjwfl.sys_role_flag" rootPath="role_flag_path"/>
+        <a:model-query defaultWhereClause="v.role_id = ${/session/@role_id} and v.role_code in (&apos;HAND&apos;,&apos;0017&apos;,&apos;0019&apos;)" model="zjwfl.sys_role_flag" rootPath="role_flag_path"/>
        <s:server-script import="contract_print_path.js"><![CDATA[
            $ctx.parameter.file_path = con_print_path['con_print_path'];
            $ctx.parameter.tomcat_source = con_print_path['tomcat_source'];
@@ -251,7 +251,11 @@
                if('${/model/role_flag_path/record/@sys_role_flag}' == 'Y') {
                    url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
                }else{
-                    url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                    if (query_only == 'Y' || '${/parameter/@function_usage}' == 'QUERY') {
+                        url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                    } else {
+                        url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                    }
                }
                var win = new Leaf.Window({
                    url: url,
@@ -302,7 +306,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>';

--- a/src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
+++ b/src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview