Merge branch 'feature/保证金优化' into develop

src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_create.lwm

@@ -60,6 +60,8 @@
         <bm:field name="object_taxpayer_type" databaseType="VARCHAR2" datatype="java.lang.String"/>
         <bm:field name="invoice_bp_address_phone_num" databaseType="VARCHAR2" datatype="java.lang.String"/>
         <bm:field name="invoice_bp_bank_account" databaseType="VARCHAR2" datatype="java.lang.String"/>
+        <bm:field name="billing_method_desc" databaseType="VARCHAR2" datatype="java.lang.String"/>
+        <bm:field name="object_taxpayer_type_desc" databaseType="VARCHAR2" datatype="java.lang.String"/>
 
     </bm:fields>
     <bm:operations>
@@ -68,11 +70,13 @@
                 select t.cashflow_id,
                 t.bp_name,--承租人姓名
                con.billing_method,--开票规则
+                con.billing_method_desc,
                con.billing_way_n,--开票方式
                con.billing_frequency_n,--开票频率
                aic.billing_object_name,--开票对象
                t.invoice_title,--发票抬头
                aic.object_taxpayer_type,--纳税人类型
+               aic.object_taxpayer_type_desc,--纳税人类型
                t.invoice_bp_address_phone_num,--开票地址电话
                t.invoice_bp_bank_account,--开户行及账号
                 t.record_id,

src/main/webapp/WEB-INF/classes/acr/ACR510N/acr_inovice_cf_v_n.lwm

@@ -375,7 +375,7 @@
 
         <!--        <bm:data-filter enforceOperations="query"-->
         <!--                        expression="not (t2.cf_item = 301 and nvl(direct_sales_agent_flag,'N') = 'Y')"/>-->
-        <bm:data-filter name="query" expression="rownum &lt;=1000"/>
-        <bm:data-filter name="query" expression="exists(select 1 from con_contract_cashflow ccc where (ccc.due_date &lt;= sysdate and ccc.cashflow_id = t2.cashflow_id and t1.inv_object_taxpayer_type != 'GENERAL_TAXPAYER') or (t1.bill_object_bp_class = 'ORG' and ccc.cashflow_id = t2.cashflow_id and t1.inv_object_taxpayer_type = 'GENERAL_TAXPAYER'))" />
+        <!--<bm:data-filter name="query" expression="rownum &lt;=1000"/>-->
+        <!--<bm:data-filter name="query" expression="exists(select 1 from con_contract_cashflow ccc where (ccc.due_date &lt;= sysdate and ccc.cashflow_id = t2.cashflow_id and t1.inv_object_taxpayer_type != 'GENERAL_TAXPAYER') or (t1.bill_object_bp_class = 'ORG' and ccc.cashflow_id = t2.cashflow_id and t1.inv_object_taxpayer_type = 'GENERAL_TAXPAYER'))" />-->
     </bm:data-filters>
 </bm:model>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_maintain_query.lwm

@@ -87,6 +87,8 @@
         <bm:field name="bank_branch_name" expression="(select bank_branch_name from csh_bank_branch where bank_branch_id = (select bank_branch_id from csh_bank_account where bank_account_id = t1.bank_account_id))" forInsert="false" forUpdate="false"/>
         <bm:field name="use_money_amount" expression="(select t1.transaction_amount-t1.returned_amount from dual)" forInsert="false" forUpdate="false"/>
         <bm:field name="opposite_band_na"/>
+        <bm:field name="applying_amount" expression="(nvl((select sum(cr.return_amount) from csh_transaction_return cr where cr.transaction_id=t1.transaction_id and cr.status='APPROVING'),0))" forInsert="false" forUpdate="false"/>
+        <bm:field name="return_id" expression="(select cr.return_id from csh_transaction_return cr where cr.transaction_id=t1.transaction_id and cr.status='APPROVING')" forInsert="false" forUpdate="false"/>
         <bm:field name="banka"/>
         <bm:field name="purpose"/>
         <bm:field name="gsber"/>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_record_query.lwm

@@ -112,12 +112,13 @@
     </bm:primary-key>
     <bm:data-filters>
         <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
-        <bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>
+        <!--<bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>-->
         <bm:data-filter name="query" expression="(t1.ref_contract_id is not null)"/>
         <bm:data-filter name="query" expression="(t1.transaction_type ='DEPOSIT')"/>
         <bm:data-filter name="query" expression="(t1.source_type is not null)"/>
     </bm:data-filters>
     <bm:query-fields>
+        <bm:query-field name="query_amount_flag" queryExpression="((${@query_amount_flag}='1' and ((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0) )or(${@query_amount_flag}='2' and ((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) =0) )or (${@query_amount_flag}='3' and ((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >=0)))"/>
         <bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
         <bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/>
         <bm:query-field field="bp_bank_account_name" queryOperator="like"/>

src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL3040/zj_wfl_my_approved_application.lwm

@@ -17,6 +17,7 @@
         <bm:field name="sequence_num"/>
         <bm:field name="document_info"/>
         <bm:field name="submitted_by"/>
+        <bm:field name="user_name"/>
         <bm:field name="submitted_by_name"/>
         <bm:field name="approve_date"/>
         <bm:field name="action_type_desc"/>
@@ -48,6 +49,9 @@
 				       t1.sequence_num,
 				       t1.document_info,
 				       t1.submitted_by,
+				        (select su.user_name
+                                 from sys_user su
+                                where su.user_id = t1.submitted_by) user_name,
 				       t1.submitted_by_name,
 				       t1.approve_date,
 				       -- to_date(t1.approve_date,'yyyy-mm-dd') approve_date,

src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL5110/sdic_wfl_instance_node_recipient1.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features">
+    <bm:fields>
+        <bm:field name="instance_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="INSTANCE_ID" prompt="ZJ_WFL_INSTANCE_NODE_RECIPIENT.INSTANCE_ID"/>
+        <bm:field name="approve_count" databaseType="NUMBER" datatype="java.lang.Long" physicalName="APPROVE_COUNT" prompt="ZJ_WFL_INSTANCE_NODE_RECIPIENT.APPROVE_COUNT"/>
+        <bm:field name="node_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="NODE_ID" prompt="ZJ_WFL_INSTANCE_NODE_RECIPIENT.NODE_ID"/>
+        <bm:field name="submitted_by" databaseType="NUMBER" datatype="java.lang.Long" physicalName="SUBMITTED_BY" prompt="ZJ_WFL_INSTANCE_NODE_RECIPIENT.NODE_ID"/>
+        <bm:field name="submitted_by_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SUBMITTED_BY_NAME"/>
+        <bm:field name="seq_number" databaseType="NUMBER" datatype="java.lang.Long" physicalName="SEQ_NUMBER" prompt="ZJ_WFL_INSTANCE_NODE_RECIPIENT.SEQ_NUMBER"/>
+        <bm:field name="user_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="USER_ID" prompt="ZJ_WFL_INSTANCE_NODE_RECIPIENT.USER_ID"/>
+        <bm:field name="date_limit" databaseType="DATE" datatype="java.util.Date" physicalName="DATE_LIMIT" prompt="ZJ_WFL_INSTANCE_NODE_RECIPIENT.DATE_LIMIT"/>
+        <bm:field name="record_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="RECORD_ID" prompt="ZJ_WFL_INSTANCE_NODE_RECIPIENT.RECORD_ID"/>
+        <bm:field name="commision_by" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMMISION_BY" prompt="ZJ_WFL_INSTANCE_NODE_RECIPIENT.COMMISION_BY"/>
+        <bm:field name="commision_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMMISION_DESC" prompt="ZJ_WFL_INSTANCE_NODE_RECIPIENT.COMMISION_DESC"/>
+        <bm:field name="last_notify_date" databaseType="DATE" datatype="java.util.Date" physicalName="LAST_NOTIFY_DATE" prompt="ZJ_WFL_INSTANCE_NODE_RECIPIENT.LAST_NOTIFY_DATE"/>
+        <bm:field name="hierarchy_record_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="HIERARCHY_RECORD_ID" prompt="ZJ_WFL_INSTANCE_NODE_RECIPIENT.HIERARCHY_RECORD_ID"/>
+        <bm:field name="workflow_id" databaseType="NUMBER" datatype="java.lang.Long" forInsert="false" forUpdate="false"/>
+        <bm:field name="workflow_code" databaseType="VARCHAR2" datatype="java.lang.String" forInsert="false" forUpdate="false"/>
+        <bm:field name="document_info" databaseType="VARCHAR2" datatype="java.lang.String" forInsert="false" forUpdate="false"/>
+        <bm:field name="workflow_info" databaseType="VARCHAR2" datatype="java.lang.String" forInsert="false" forUpdate="false"/>
+        <bm:field name="node_desc" databaseType="VARCHAR2" datatype="java.lang.String" forInsert="false" forUpdate="false"/>
+        <bm:field name="workflow_desc" databaseType="VARCHAR2" datatype="java.lang.String" forInsert="false" forUpdate="false"/>
+        <bm:field name="creation_date_format" databaseType="VARCHAR2" datatype="java.lang.String" forInsert="false" forUpdate="false"/>
+        <bm:field name="urgent_type"/>
+
+
+        <bm:field name="record_type"/>
+        <bm:field name="residence_date_format"/>
+        <bm:field name="list_type"/>
+        <bm:field name="url_link"/>
+        <bm:field name="creation_date"/>
+        <bm:field name="winid"/>
+    </bm:fields>
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+    			select * from ( select s.instance_id,
+        s.approve_count,
+        s.submitted_by,
+        s.submitted_by_name,
+        s.node_id,
+        s.node_desc,
+        s.hierarchy_record_id,
+        s.seq_number,
+        s.user_id,
+        s.date_limit,
+        s.record_id,
+        s.commision_by,
+        s.commision_desc,
+        s.last_notify_date,
+        s.workflow_id,
+        s.workflow_code,
+        s.workflow_desc,
+        s.workflow_desc || '-' || s.node_desc as workflow_info,
+        s.document_info,
+        to_char(s.creation_date, 'yyyy-mm-dd hh24:mi:ss') as creation_date_format,
+        CAST(sysdate AS TIMESTAMP) - CAST(s.creation_date AS TIMESTAMP) || '' as residence_date_format,
+        s.urgent_type,
+
+        s.record_type,
+        'SYS_WFL' LIST_TYPE,
+        null url_link,
+        s.creation_date,
+        null winid
+   from zj_wfl_instance_node_rcpt_v s
+)t1
+#WHERE_CLAUSE#
+    		]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:data-filters>
+        <bm:data-filter enforceOperations="query" expression="t1.user_id = ${/session/@user_id}"/>
+    </bm:data-filters>
+    <bm:query-fields>
+        <bm:query-field name="any_info" queryExpression="(t1.workflow_desc like  &apos;%&apos;|| ${@any_info} || &apos;%&apos; or t1.node_desc like  &apos;%&apos;|| ${@any_info} || &apos;%&apos; or t1.document_info like  &apos;%&apos;|| ${@any_info} || &apos;%&apos; or to_char(t1.creation_date, &apos;yyyy-mm-dd hh24:mi:ss&apos;) like &apos;%&apos;|| ${@any_info} || &apos;%&apos; or t1.submitted_by_name like &apos;%&apos;|| ${@any_info} || &apos;%&apos; )"/>
+        <bm:query-field name="workflow_info" queryExpression="(t1.workflow_desc like  &apos;%&apos;|| ${@workflow_info} || &apos;%&apos; or t1.node_desc like  &apos;%&apos;|| ${@workflow_info} || &apos;%&apos;)"/>
+        <bm:query-field name="document_info" queryExpression="t1.document_info like  &apos;%&apos;|| ${@document_info} || &apos;%&apos;"/>
+    </bm:query-fields>
+</bm:model>

src/main/webapp/home_page/WIDGET-ASSET/WIDGET-ASSET-COUNT.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    $Author:
+    $Date: 2018/8/2
+    $Revision: 1.0
+    微件-资产统计-租赁性质
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application">
+    <a:init-procedure/>
+    <a:view template="default" package="leaf.ui.std">
+        <!--单独微件测试用-->
+        <!--<script src="${/request/@context_path}/leafresource/js/attach/g2.min.js"></script>-->
+        <style>
+            html, body {
+                width: 840px;
+                height: 264px;
+                margin: 0;
+                padding: 0;
+                color: #000;
+            }
+
+            .widget_asset_count {
+                box-sizing: border-box;
+                width: 840px;
+                height: 264px;
+                padding: 0;
+                background-color: #fff;
+                position: relative;
+                border: 1px solid #F0F0F3;
+                cursor: default;
+            }
+
+            .widget_asset_count .widget_label {
+                position: absolute;
+                width: 40px;
+                height: 4px;
+                top: 0;
+                left: 16px;
+                background-color: #5A7FFF;
+            }
+
+            .widget_asset_count .row1 {
+                position: relative;
+                padding: 16px 0 8px 16px;
+                font-family: PingFangSC-Medium;
+                font-size: 14px;
+                color: rgba(75, 80, 90, 0.85);
+                letter-spacing: 0;
+                border-bottom: 1px solid #F0F0F3;
+            }
+
+            .widget_asset_count .row2 {
+                box-sizing: border-box;
+                height: 218px;
+            }
+
+            .widget_asset_count .row2 .left {
+                float: left;
+            }
+
+            .widget_asset_count .row2 .right {
+                float: left;
+                padding-top: 48px;
+                width: 594px;
+            }
+
+            .widget_asset_count .row2 .right .title {
+                height: 42px;
+                line-height: 42px;
+                border-bottom: 1px solid #D8D8D8;
+                font-family: PingFangSC-Regular;
+                font-size: 17px;
+                color: rgba(0, 0, 0, 0.45);
+            }
+
+            .widget_asset_count .row2 .right .title span {
+                margin-right: 60px;
+            }
+
+            .widget_asset_count .row2 .right .bodyList {
+                margin-top: 40px;
+            }
+
+            .widget_asset_count .row2 .right .bodyList .li {
+                font-family: PingFangSC-Regular;
+                font-size: 17px;
+                color: rgba(0, 0, 0, 0.45);
+                height: 24px;
+                line-height: 24px;
+            }
+
+            .widget_asset_count .row2 .right .bodyList .li i {
+                display: inline-block;
+                width: 8px;
+                height: 8px;
+                border-radius: 4px;
+                margin-right: 15px;
+            }
+
+            .widget_asset_count .row2 .right .bodyList .li span {
+                margin-right: 30px;
+            }
+
+            .widget_asset_count .row2 .right .bodyList .li span:last-child {
+                margin-right: 40px;
+            }
+
+            .widget_asset_count .row2 .clearFloat {
+                clear: both;
+                height: 0;
+                line-height: 0;
+                font-size: 0
+            }
+        </style>
+        <script><![CDATA[
+        jQuery(document).ready(function () {
+            var chartData = [{
+                item: '融资租赁',
+                per: 78
+            }, {
+                item: '经营租赁',
+                per: 22
+            }];
+            // 关闭 G2 的体验改进计划打点请求
+            G2.track(false);
+            var widget_asset_count_chart = new G2.Chart({
+                container: 'widget_asset_count_chart',
+                width: 206,
+                height: 218,
+                animate: false,
+                padding: 10
+            });
+            widget_asset_count_chart.source(chartData);
+            widget_asset_count_chart.coord('theta', {
+                radius: 0.75,
+                innerRadius: 0.72
+            });
+            widget_asset_count_chart.tooltip({
+                showTitle: false,
+                itemTpl: '<li><span style="background-color:{color};" class="g2-tooltip-marker"></span>{name}: {value}</li>'
+            });
+            widget_asset_count_chart.guide().html({
+                position: ['50%', '50%'],
+                html: '<div style="font-size: 14px;color: rgba(75,80,90,0.85);text-align:center;width: 10em;"><p>融资租赁</p><p>' + chartData[0]['per'] + '</p></div>',
+                alignX: 'middle',
+                alignY: 'middle'
+            });
+            widget_asset_count_chart.legend(false);
+            var interval = widget_asset_count_chart.intervalStack()
+                .position('per')
+                .color('item', ['#5A7FFF', '#FF8665'])
+                .tooltip('item*per', function (item, per) {
+                    return {
+                        name: item,
+                        value: per
+                    };
+                }).style({
+                    lineWidth: 1,
+                    stroke: '#fff'
+                });
+            widget_asset_count_chart.render();
+        });
+
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="con_asset_count_ds" autoQuery="true" pageSize="5" model="ast.AST511.con_asset_count">
+                <a:fields>
+                    <a:field name="contract_number"/>
+                </a:fields>
+            </a:dataSet>
+        </a:dataSets>
+        <div class="widget_asset_count">
+            <span class="widget_label"> </span>
+            <div class="row1">资产统计</div>
+            <div class="row2">
+                <div class="left" id="widget_asset_count_chart"></div>
+                <div class="right">
+                    <div class="title">
+                        <span>租赁性质</span>
+                        <span>占比</span>
+                        <span>币种</span>
+                    </div>
+                    <div class="bodyList">
+                        <span class="li">
+                            <i style="background: #7292FF"/>
+                            <span>融资租赁</span>
+                            <span>99.90%</span>
+                            <span>人民币</span>
+                        </span>
+                        <span class="li">
+                            <i style="background: #FF8665;"/>
+                            <span>经营租赁</span>
+                            <span>0.01%</span>
+                            <span>人民币</span>
+                        </span>
+                    </div>
+                </div>
+                <div class="clearFloat"></div>
+            </div>
+        </div>
+        <a:screenBody style="display:none"></a:screenBody>
+    </a:view>
+</a:screen>
\ No newline at end of file

src/main/webapp/home_page/WIDGET-ASSET/WIDGET-GOQUERY-FUND.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    $Author:
+    $Date: 2018/8/2
+    $Revision: 1.0
+    微件-资产-进入资金信息查询界面
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application">
+    <a:init-procedure/>
+    <a:view template="default" package="leaf.ui.std">
+        <style>
+            html,body{
+            width:264px;
+            height:264px;
+            margin: 0;
+            padding: 0;
+            color:#000;
+            }
+            .widget_goquery_fund{
+            box-sizing:border-box;
+            width:264px;
+            height:264px;
+            padding:16px;
+            background-color:#fff;
+            position:relative;
+            border:1px solid #F0F0F3;
+            cursor:default;
+            }
+            .widget_goquery_fund .widget_label{
+            position:absolute;
+            width:40px;
+            height:4px;
+            top:0;
+            left:16px;
+            background-color:#5A7FFF;
+            }
+            .widget_goquery_fund .go_query_fund_img{
+            width:232px;
+            height:150px;
+            display:block;
+            text-align:center;
+            }
+            .widget_goquery_fund .go_query_btn{
+            margin-left:24px;
+            margin-top:27px;
+            height:22px;
+            font-family: PingFangSC-Regular;
+            font-size: 16px;
+            color: #5A7FFF;
+            cursor:pointer;
+            }
+            .widget_goquery_fund .go_query_btn img{
+            width:16px;
+            margin-left:8px;
+            position:relative;
+            top:2px;
+            }
+        </style>
+        <script><![CDATA[
+        jQuery(document).ready(function(){
+            jQuery(".go_query_btn").click(function(){
+                //进入资金信息查询界面
+            });
+        });
+            ]]></script>
+        <div class="widget_goquery_fund">
+            <span class="widget_label"> </span>
+            <img class="go_query_fund_img" src="${/request/@context_path}/leafresource/images/widget/go_query_fund.png"/>
+            <div class="go_query_btn">
+                <span>进入资金信息查询界面</span>
+                <img class="icon"  src="${/request/@context_path}/leafresource/images/widget/rightSquare.png"/>
+            </div>
+        </div>
+        <a:screenBody style="display:none"> </a:screenBody>
+    </a:view>
+</a:screen>
\ No newline at end of file

src/main/webapp/home_page/WIDGET-BP/WIDGET-BP-COUNT-old-bak.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    $Author:
+    $Date: 2018/8/2
+    $Revision: 1.0
+    1.商业伙伴统计
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application">
+    <a:init-procedure/>
+    <a:view template="default" package="leaf.ui.std">
+        <!--Beyond styles-->
+        <link href="${/request/@context_path}/leafresource/hls/beyondChart/assets/css/beyond.min.css" rel="stylesheet" />
+        <link href="${/request/@context_path}/leafresource/hls/beyondChart/assets/css/demo.min.css" rel="stylesheet" />
+        <link href="${/request/@context_path}/leafresource/hls/beyondChart/assets/css/typicons.min.css" rel="stylesheet" />
+        <link href="${/request/@context_path}/leafresource/hls/beyondChart/assets/css/animate.min.css" rel="stylesheet" />
+
+        <!--Basic Scripts-->
+        <script src="${/request/@context_path}/leafresource/hls/beyondChart/assets/js/skins.min.js"></script>
+        <script src="${/request/@context_path}/leafresource/hls/beyondChart/assets/js/bootstrap.min.js"></script>
+        <script src="${/request/@context_path}/leafresource/hls/beyondChart/assets/js/slimscroll/jquery.slimscroll.min.js"></script>
+        <!--Beyond Scripts-->
+        <script src="${/request/@context_path}/leafresource/hls/beyondChart/assets/js/beyond.min.js"></script>
+
+        <!--Page Related Scripts-->
+        <script src="${/request/@context_path}/leafresource/hls/beyondChart/assets/js/charts/morris/raphael-2.0.2.min.js"></script>
+        <script src="${/request/@context_path}/leafresource/hls/beyondChart/assets/js/charts/morris/morris.js"></script>
+        <script src="${/request/@context_path}/leafresource/hls/beyondChart/assets/js/charts/morris/morris-init.js"></script>
+
+        <style>
+            html,body{
+            background-color:#eee;
+            width:870px;
+            height:355px;
+            margin: 0;
+            padding: 0;
+            }
+            .widget_bp_count{
+            width:870px;
+            height:355px;
+            background-color:#fff;
+            }
+            .widget_bp_count .clickable{
+            cursor:pointer;
+            }
+            .widget_bp_count_title{
+            background:#E75B8D;
+            color:#fff;
+            height:50px;
+            line-height:50px;
+            border-top-left-radius:5px;
+            border-top-right-radius:5px;
+            }
+            .widget_bp_count_title img{
+            width:25px;
+            height:25px;
+            position:relative;
+            top:12.5px;
+            }
+            .widget_bp_count_title .title-left{
+            display:inline-block;
+            float:left;
+            line-height:50px;
+            margin-left:15px;
+            }
+            .widget_bp_count_title .title-right{
+            display:inlne-block;
+            float:right;
+            line-height:50px;
+            margin-right:15px;
+            }
+            .widget_bp_count_title .clearFloat{
+            clear:both;
+            height:0;
+            line-height:0;
+            font-size:0
+            }
+            .widget_bp_count_chart{
+            background-color:#fff;
+            }
+        </style>
+        <script><![CDATA[
+        function on_bp_category_count_ds_load(){
+            var records=$('bp_category_count_ds').data;
+            var data=[];
+            if(records!==null && records.length>0){
+                records.forEach(function(i){
+                    data.push(i.data);
+                });
+            }
+            Morris.Bar({
+              noDataContent: "暂无数据",
+              element: 'chart',
+              data: data,
+              xkey: 'category',
+              ymax: 'auto',
+              ykeys: ['count'],
+              labels: ['人数'],
+              hideHover: 'auto',
+              barColors:['#42A5F5'],
+              barSizeRatio:0.3,
+              xLabelMargin:3
+            });
+        };
+        function total_count_label_renderer(value,record,name){
+            return '总数'+value
+        }
+        function this_month_count_label_renderer(value,record,name){
+            return '本月新增'+value
+        }
+        function go_bp_query(){
+            <!--top.mainJumpCode('HLS214N');-->
+            location.href='/modules/hls/HLS214N/hls_bp_master_modify_entrance.lview?layout_code=BP_MODIFY_ENTRANCE&function_code=HLS214N';
+        }
+            ]]></script>
+        <a:dataSets>
+            <a:dataSet id="bp_category_count_ds" autoQuery="true" model="bp.bp_category_count">
+                <a:fields>
+                    <a:field name="category"/>
+                    <a:field name="count"/>
+                </a:fields>
+                <a:events>
+                    <a:event name="load" handler="on_bp_category_count_ds_load"/>
+                </a:events>
+            </a:dataSet>
+            <a:dataSet id="bp_total_count_ds" autoQuery="true" model="bp.bp_total_count">
+                <a:fields>
+                    <a:field name="total"/>
+                    <a:field name="this_month_total"/>
+                </a:fields>
+            </a:dataSet>
+        </a:dataSets>
+        <div class="widget_bp_count">
+            <div class="widget_bp_count_title">
+                <div class="title-left">
+                    <img src="${base.contextPath}/leafresource/images/widget/line.png" alt="png"/>
+                </div>
+                <div class="title-left">
+                    <span class="title_style">商业伙伴统计</span>
+                </div>
+                <a:label className="title-left" bindTarget="bp_total_count_ds" name="total" renderer="total_count_label_renderer" style="width:auto"/>
+                <a:label className="title-left" bindTarget="bp_total_count_ds" name="this_month_total" renderer="this_month_count_label_renderer" style="width:auto"/>
+                <div class="title-right">
+                    <img class="clickable" src="${base.contextPath}/leafresource/images/widget/homeAdd.png" style="margin-right:3px"/>
+                    <img class="clickable" onclick="go_bp_query()" src="${base.contextPath}/leafresource/images/widget/whiteQuery.png"/>
+                </div>
+                <div class="clearFloat"></div>
+            </div>
+            <div class="widget_bp_count_chart">
+                <div id="chart" style="width:870px;height:305px"></div>
+            </div>
+        </div>
+        <a:screenBody style="display:none">
+
+        </a:screenBody>
+    </a:view>
+</a:screen>

src/main/webapp/home_page/WIDGET-BP/WIDGET-BP-COUNT.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    $Date: 2018/9/4
+    微件-客户数量统计
+    WIDGET-BP-COUNT
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application">
+    <a:init-procedure/>
+    <a:view template="default" package="leaf.ui.std">
+        <!--单独微件测试用-->
+        <!--<script src="${/request/@context_path}/leafresource/js/attach/g2.min.js"></script>-->
+        <style>
+            html,body{
+            background-color:#eee;
+            width:264px;
+            height:264px;
+            margin: 0;
+            padding: 0;
+            }
+            .widget_bp_count{
+            box-sizing:border-box;
+            width:264px;
+            height:264px;
+            background-color:#fff;
+            position:relative;
+            border:1px solid #F0F0F3;
+            cursor:default;
+            }
+            .widget_bp_count .widget_label{
+            position:absolute;
+            width:40px;
+            height:4px;
+            top:0;
+            left:16px;
+            background-color: #FFD95B;
+            }
+            .widget_bp_count .row1{
+            position:relative;
+            height:22px;
+            padding:16px 13px 8px 16px;
+            border-bottom:1px solid #F0F0F3;
+            }
+            .widget_bp_count .row1 .left{
+            line-height:22px;
+            font-family: PingFangSC-Medium;
+            font-size: 14px;
+            color: rgba(75,80,90,0.85);
+            }
+            .widget_bp_count .row1 .right{
+            position:absolute;
+            right:13px;
+            bottom:8px;
+            font-family: PingFangSC-Regular;
+            font-size: 12px;
+            color: rgba(75,80,90,0.75);
+            }
+            .widget_bp_count .row1 .right #this_month_new{
+            margin-left:5px;
+            font-family: Baskerville-SemiBoldItalic;
+            font-size: 12px;
+            color: #4866CC;
+            }
+            .widget_bp_count .row2{
+            height:20px;
+            margin:8px auto;
+            text-align:center;
+            font-family: PingFangSC-Regular;
+            font-size: 14px;
+            color: rgba(75,80,90,0.75);
+            }
+            .widget_bp_count .row2 #total_bp_amount{
+            font-family: Baskerville-SemiBoldItalic;
+            font-size: 14px;
+            color: #FFC200;
+            margin-left:5px;
+            }
+            .widget_bp_count .row3 .g-guide .center_label{
+            text-align:center;
+            width:10em;
+            }
+            .widget_bp_count .row3 .g-guide .center_label .type{
+            font-family: PingFangSC-Regular;
+            font-size: 13.87px;
+            color: rgba(75,80,90,0.85);
+            line-height: 21.67px;
+            margin:0;
+            }
+            .widget_bp_count .row3 .g-guide .center_label .count{
+            font-family: PingFangSC-Regular;
+            font-size: 16.25px;
+            color: #4B505A;
+            line-height: 17.31px;
+            margin:0;
+            }
+        </style>
+        <script><![CDATA[
+        function on_bp_type_count_ds_load(ds){
+            var records=ds.data;
+            var chartData=[];
+            if(records!==null && records.length>0){
+                records.forEach(function(i){
+                    chartData.push(i.data);
+                });
+            }
+            // 关闭 G2 的体验改进计划打点请求
+            G2.track(false);
+            var bp_type_count_chart = new G2.Chart({
+                container: 'bp_type_count_chart',
+                width: 262,
+                height: 180,
+                animate: false,
+                padding: 5
+            });
+            bp_type_count_chart.source(chartData);
+            bp_type_count_chart.coord('theta', {
+                radius: 0.75,
+                innerRadius: 0.74
+            });
+            bp_type_count_chart.tooltip({
+                showTitle: false,
+                itemTpl: '<li><span style="background-color:{color};" class="g2-tooltip-marker"></span>{name}: {value}</li>'
+            });
+            bp_type_count_chart.guide().html({
+                position: ['50%', '50%'],
+                html: '<div class="center_label"><p class="type">' + chartData[0].type + '</p><p class="count">' + chartData[0].count + '</p></div>'
+            });
+            bp_type_count_chart.legend(false);
+            var interval = bp_type_count_chart.intervalStack()
+                .position('count')
+                .color('type', ['#00D093', '#5A7FFF','#A5BAFF',' #AFB6BC',' #5B637B','#FFC200'])
+                .tooltip('type*count', function (type, count) {
+                    return {
+                        name: type,
+                        value: count
+                    };
+                }).style({
+                    lineWidth: 1,
+                    stroke: '#fff'
+                });
+            bp_type_count_chart.render();
+            interval.setSelected(chartData[0]);
+            bp_type_count_chart.on('interval:click', function(ev){
+                var curData = ev.data._origin;
+                jQuery(".widget_bp_count .center_label .type").text(curData.type);
+                jQuery(".widget_bp_count .center_label .count").text(curData.count);
+            });
+        };
+        function on_bp_total_count_ds_load(ds){
+            var this_month_total = ds.data[0].data["this_month_total"] || 0;
+            jQuery(".widget_bp_count #this_month_new").text(this_month_total);
+
+            var total_bp_amount = ds.data[0].data["total"] || 0;
+            jQuery(".widget_bp_count #total_bp_amount").text(total_bp_amount);
+        }
+            ]]></script>
+        <a:dataSets>
+            <a:dataSet id="bp_category_count_ds" autoQuery="true" fetchAll="true" model="bp.bp_type_count">
+                <a:fields>
+                    <a:field name="type"/>
+                    <a:field name="count"/>
+                </a:fields>
+                <a:events>
+                    <a:event name="load" handler="on_bp_type_count_ds_load"/>
+                </a:events>
+            </a:dataSet>
+            <a:dataSet id="bp_total_count_ds" autoQuery="true" fetchAll="true" model="bp.bp_total_count">
+                <a:fields>
+                    <a:field name="total"/>
+                    <a:field name="this_month_total"/>
+                </a:fields>
+                <a:events>
+                    <a:event name="load" handler="on_bp_total_count_ds_load"/>
+                </a:events>
+            </a:dataSet>
+        </a:dataSets>
+        <div class="widget_bp_count">
+            <span class="widget_label"> </span>
+            <div class="row1">
+                <span class="left">客户数量统计</span>
+                <span class="right">
+                    <span>本月新增客户:</span>
+                    <span id="this_month_new"></span>
+                </span>
+            </div>
+            <div class="row2">
+                <span>客户总数：</span>
+                <span id="total_bp_amount"></span>
+            </div>
+            <div class="row3" id="bp_type_count_chart"> </div>
+        </div>
+        <a:screenBody style="display:none"> </a:screenBody>
+    </a:view>
+</a:screen>

src/main/webapp/home_page/WIDGET-BP/WIDGET-BP-FAV.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    $Date: 2018/9/2
+    微件-商业伙伴收藏夹
+    WIDGET-BP-FAV
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application">
+    <a:init-procedure/>
+    <a:view template="default" package="leaf.ui.std">
+        <style>
+            html,body{
+            width:360px;
+            height:360px;
+            margin: 0;
+            padding: 0;
+            color:#000;
+            }
+            .widget_bp_fav{
+            box-sizing:border-box;
+            width:360px;
+            height:360px;
+            background-color:#fff;
+            position:relative;
+            border:1px solid #F0F0F3;
+            user-select:none;
+            cursor:default;
+            }
+            .widget_bp_fav .widget_label{
+            position:absolute;
+            width:40px;
+            height:4px;
+            top:0;
+            left:16px;
+            background-color:#5A7FFF;
+            }
+            .widget_bp_fav .row1{
+            position:relative;
+            height:20px;
+            line-height:20px;
+            margin:16px 0 9px 16px;
+            font-family: PingFangSC-Medium;
+            font-size: 14px;
+            color: rgba(75,80,90,0.85);
+            letter-spacing: 0;
+            border-bottom:1px solid #F0F0F3;
+            }
+            .widget_bp_fav .hls-pagging-grid{
+            width:100%;
+            height:312px;
+            -webkit-box-shadow:none;
+            box-shadow:none;
+            }
+            .widget_bp_fav .hls-pagging-grid .grid-title{
+            display:none;
+            }
+            .widget_bp_fav .hls-pagging-grid .grid-body{
+            padding:0;
+            }
+            .widget_bp_fav .hls-pagging-grid .hls-table>tr:first-child{
+            display:none;
+            }
+            .widget_bp_fav .hls-pagging-grid .hls-table tbody tr:first-child{
+            height:48px;
+            border-top:1px solid #F0F0F3;
+            }
+            .widget_bp_fav .hls-pagging-grid .hls-table tr{
+            height:48px;
+            font-family: PingFangSC-Medium;
+            font-size: 12px;
+            color: rgba(93,97,103,0.85);
+            letter-spacing: 0;
+            border-bottom:1px solid #F0F0F3;
+            }
+            .widget_bp_fav .hls-pagging-grid .hls-table tr:hover{
+            background: rgba(90,127,255,0.08);
+            }
+            .widget_bp_fav .hls-pagging-grid .hls-table-active{
+            background: rgba(90,127,255,0.08);
+            }
+            .widget_bp_fav .hls-pagging-grid .grid-foot{
+            height: 36px;
+            margin-top:0;
+            line-height:36px;
+            }
+        </style>
+        <script><![CDATA[
+        function bp_cancel_fav_renderer(record,index){
+            return 'kkk'
+        }
+            ]]></script>
+        <a:dataSets>
+            <a:dataSet id="widget_bp_fav_ds" autoQuery="true" pageSize="5" model="bp.bp_new_add" >
+                <a:fields>
+                    <a:field name="bp_name"/>
+                    <a:field name="name"/>
+                    <a:field name="legal_person"/>
+                    <a:field name="status"/>
+                </a:fields>
+                <a:events>
+                    <a:event name="load" handler="myContLoader"/>
+                </a:events>
+            </a:dataSet>
+        </a:dataSets>
+        <div class="widget_bp_fav">
+            <span class="widget_label"> </span>
+            <div class="row1">收藏夹</div>
+            <a:hapGrid id="widget_bp_fav_grid" bindTarget="widget_bp_fav_ds" canWheel="true">
+                <a:columns>
+                    <a:column name="bp_name" prompt="商业伙伴名称"/>
+                    <a:column name="bp_category_n" prompt="类型"/>
+                    <a:column template="bp_cancel_fav_renderer" prompt="取消收藏"/>
+                </a:columns>
+            </a:hapGrid>
+        </div>
+        <a:screenBody style="display:none"> </a:screenBody>
+    </a:view>
+</a:screen>
\ No newline at end of file

src/main/webapp/home_page/WIDGET-BP/WIDGET-BP-NEW-ADD-old-bak.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    $Author:
+    $Date: 2018/8/2
+    $Revision: 1.0
+    2.最近添加商业伙伴
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application">
+    <a:init-procedure/>
+    <a:view template="default" package="leaf.ui.std">
+        <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
+        <a:link id="hls_bp_master_modify_link" url="${/request/@context_path}/modules/hls/HLS214N/hls_bp_master_modify.lview"/>
+        <style>
+            html,body{
+            background-color:#fff;
+            width:552px;
+            height:337px;
+            margin: 0;
+            padding: 0;
+            }
+            .bp_new_add .hls-pagging-grid .grid-title {
+                display: none;
+            }
+            .bp_new_add .hls-pagging-grid{
+                width:552px;
+                height:292px;
+            }
+            .bp_new_add .title{
+                height:44px ;
+                width: 100%;
+                border-bottom: 1px solid  #F0F0F3;
+            }
+        </style>
+        <script><![CDATA[
+        function bp_edit_btn_renderer(record,index){
+            return "<img onclick='open_bp_modify_win(\"" + record.ds.id + "\",\""+record.id+ "\")' style='cursor:pointer;width:15px;height:15px;display:inline-block;margin:0px;' src='${base.contextPath}/leafresource/images/widget/modify.png' alt='png'/>";
+        }
+        function bp_fav_btn_renderer(record,index){
+            if (record.data.collectFlag == 'Y') {
+                return "<img id='" + record.data.bp_id + "' onclick='toggle_collect(" + record.data.bp_id + ")' style='cursor:pointer;width:15px;height:15px;display:inline-block;margin:0px;' src='${base.contextPath}/leafresource/images/widget/light1.png' alt='png'/>";
+            } else {
+                return "<img id='" + record.data.bp_id + "' onclick='toggle_collect(" + record.data.bp_id + ")' style='cursor:pointer;width:15px;height:15px;display:inline-block;margin:0px;' src='${base.contextPath}/leafresource/images/widget/unLight1.png' alt='png'/>";
+            }
+        }
+        function toggle_collect(bp_id) {
+            var icon = document.getElementById(bp_id);
+            if (icon.src.substr(icon.src.length - 12) != 'unLight1.png') {
+                <!--取消收藏-->
+                icon.src = "${base.contextPath}/leafresource/images/widget/unLight1.png"
+                <!--$.ajax({-->
+                    <!--url: '${base.contextPath}' + "/hls/favorite/collect/submit?collectBpId=" + collectBpId,-->
+                    <!--type: "POST",-->
+                    <!--dataType: "json",-->
+                    <!--contentType: "application/json",-->
+                    <!--success: function (e) {-->
+                        <!--parent.kendo.ui.showInfoDialog({-->
+                            <!--title: "提示",-->
+                            <!--message: "收藏成功！"-->
+                        <!--})-->
+                        <!--if(getWindowObj("BP801W")){-->
+                            <!--getWindowObj("BP801W").contentWindow. BP801W_rollTableDataSource.read();-->
+                        <!--}-->
+                    <!--},-->
+                    <!--error: function () {-->
+                    <!--}-->
+                <!--});-->
+            } else {
+                <!--//收藏-->
+                icon.src = "${base.contextPath}/leafresource/images/widget/light1.png"
+            }
+        }
+        function open_bp_modify_win(ds_id, record_id) {
+            var record = $(ds_id).findById(record_id);
+            var param = record.data;
+            param['cond_para2'] = param['bp_type'];
+            param['function_code'] = 'HLS224D';
+            param['function_usage'] = 'MODIFY';
+            param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
+
+            var bm_url_link='con_contract_get_layout_code_link_id';
+            var list_ds=ds_id;
+
+            Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
+            Leaf.request({
+                url: $(bm_url_link).getUrl(),
+                para: param,
+                success: function(res) {
+                    Leaf.Masker.unmask(Ext.getBody());
+                    param['layout_code'] = 'BP_MODIFY';
+                    param['winid'] = 'hls_doc_get_layout_code_winid';
+                    var win = new Leaf.Window({
+                        id: param['winid'],
+                        params: param,
+                        url: $('hls_bp_master_modify_link').getUrl(),
+                        title: param['url_title'] + '(BP_MODIFY)',
+                        fullScreen: true,
+                        draggable: true
+                    });
+                    win.on('close', function() {
+                        if (list_ds) {
+                            $(list_ds).query();
+                        }
+                    });
+                },
+                failure: function() {
+                    Leaf.Masker.unmask(Ext.getBody());
+                },
+                error: function() {
+                    Leaf.Masker.unmask(Ext.getBody());
+                },
+                scope: this
+            });
+        }
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="bp_trend_ds" autoQuery="true" pageSize="5" model="bp.bp_new_add">
+                <a:fields>
+                </a:fields>
+            </a:dataSet>
+        </a:dataSets>
+        <div class="bp_new_add">
+            <div class="title">
+
+            </div>
+            <a:hapGrid id="bp-new-add-grid"  bindTarget="bp_trend_ds" canWheel="true">
+                <a:columns>
+                    <a:column name="creation_date_n" prompt="添加日期" width="80"/>
+                    <a:column name="bp_name" prompt="商业伙伴名称" width="150"/>
+                    <a:column name="bp_category_n"  prompt="商业伙伴类型" width="80"/>
+                    <a:column template="bp_edit_btn_renderer" prompt="编辑" width="40"/>
+                    <a:column template="bp_fav_btn_renderer" prompt="收藏" width="40"/>
+                </a:columns>
+            </a:hapGrid>
+        </div>
+        <a:screenBody style="display:none"></a:screenBody>
+    </a:view>
+</a:screen>

src/main/webapp/home_page/WIDGET-BP/WIDGET-BP-TREND-old-bak.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    $Author:
+    $Date: 2018/8/2
+    $Revision: 1.0
+    3.商业伙伴动态
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application">
+    <a:init-procedure/>
+    <a:view template="default" package="leaf.ui.std">
+        <style>
+            html,body{
+            background-color:#fff;
+            width:570px;
+            height:355px;
+            margin: 0;
+            padding: 0;
+            }
+            .bp_trend .hls-pagging-grid{
+            width:550px;
+            }
+            .bp_trend .hls-pagging-grid .grid-title{
+            border-bottom:5px solid #9FD661;
+            height:45px;
+            }
+            .bp_trend .hls-pagging-grid .grid-title>img{
+            width:20px;
+            height:20px;
+            position:relative;
+            top:5px;
+            }
+            .bp_trend .hls-pagging-grid .grid-title>span{
+            font-family:"Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Microsoft Yahei", "Hiragino Sans GB", sans-serif;
+            font-size:13px;
+            line-height:45px;
+            color:#000;
+            text-size-adjust:100%;
+            font-weight:bold;
+            }
+        </style>
+        <script><![CDATA[
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="bp_trend_ds" autoQuery="true" pageSize="5" model="cont.CON1002.con_contract_trend">
+                <a:fields>
+                    <a:field name="contract_name"/>
+                    <a:field name="contract_status_desc"/>
+                    <a:field name="req_date"/>
+                </a:fields>
+            </a:dataSet>
+        </a:dataSets>
+        <div class="bp_trend">
+            <a:hapGrid id="bp_trend" title="动态" bindTarget="bp_trend_ds" titleImg="/leafresource/images/widget/message.png" canWheel="true">
+                <a:columns>
+                    <a:column name="contract_name" prompt="商业伙伴名称" width="180"/>
+                    <a:column name="contract_status_desc" prompt="合同状态" width="80"/>
+                    <a:column name="req_date"  prompt="变更时间" width="80"/>
+                </a:columns>
+            </a:hapGrid>
+        </div>
+        <a:screenBody style="display:none"> </a:screenBody>
+    </a:view>
+</a:screen>

src/main/webapp/home_page/WIDGET-BP/WIDGET-LEAF-SYSTEM-NOTICE.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    $Date: 2018/9/4
+    微件-公告栏
+    WIDGET-SYS-MSG
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application">
+    <a:init-procedure/>
+    <a:view template="default" package="leaf.ui.std">
+        <!--<meta name="_csrf" content="${/session/@_csrf.token}"/>-->
+        <!--<meta name="_csrf_header" content="X-CSRF-TOKEN" />-->
+        <a:link id="sys_notice_msg_url" url="${/request/@context_path}/modules/sys/SYS100/sys_notice_msg_html.lview"/>
+        <a:link id="all_sys_notice_msg_url" url="${/request/@context_path}/modules/sys/SYS100/sys_notice_msg.lview"/>
+        <style>
+            html,body{
+                background-color:#eee;
+                width:241px;
+                height:273px;
+                margin: 0;
+                padding: 0;
+            }
+            .widget_leaf_sys_msg{
+                box-sizing:border-box;
+                width:241px;
+                height:273px;
+                background-color:#fff;
+                position:relative;
+                border:1px solid #F0F0F3;
+                cursor:default;
+            }
+            .widget_leaf_sys_msg .widget_label{
+                position:absolute;
+                width:40px;
+                height:4px;
+                top:0;
+                left:16px;
+                background-color: #5A7FFF;
+            }
+            .widget_leaf_sys_msg .header{
+                position:relative;
+                height:22px;
+                padding:12px 12px 6px 16px;
+                font-family: PingFangSC-Medium;
+                font-size: 14px;
+                color: #4B505A;
+            }
+            .widget_leaf_sys_msg .header{
+                position:relative;
+                height:22px;
+                padding:24px 12px 6px 27px;
+                font-family: PingFangSC-Medium;
+                font-size: 14px;
+                color: #4B505A;
+                /*border-bottom:1px solid #F0F0F3;*/
+            }
+            .widget_leaf_sys_msg .header .more-notice-img{
+                width: 8px;
+                position: absolute;
+                right: 18px;
+                top: 25px;
+                cursor: pointer;
+            }
+            .widget_leaf_sys_msg .header .title-line{
+                width: 29px;
+                height: 5px;
+                background-color: #657efe;
+                margin-top: 4px;
+            }
+            .widget_leaf_sys_msg .header .more-notice{
+                width: 175px;
+                margin-left: 33px;
+            }
+            .widget_leaf_sys_msg .header a{
+                font-family: PingFangSC-Regular;
+                font-size: 12px;
+                color: rgba(93,97,103,0.70);
+                float:right;
+            }
+            .widget_leaf_sys_msg .top_msg{
+                margin: 11px 0 0 30px;
+            }
+            .widget_leaf_sys_msg .top_msg img{
+                width:173px;
+
+            }
+            .widget_leaf_sys_msg .top_msg .title{
+                width: 240px;
+                height: 24px;
+                box-sizing: border-box;
+                font-family: PingFangSC-Regular;
+                font-size: 12px;
+                color: #FFFFFF;
+                z-index: 10;
+                background: rgba(41,66,97,0.7);
+                line-height: 24px;
+                padding-left: 8px;
+                position: relative;
+                top: -24px;
+            }
+
+            .widget_leaf_sys_msg .msg_list{
+                position: relative;
+                box-sizing: border-box;
+                padding: 17px 20px 0 21px;
+            }
+            .widget_leaf_sys_msg .msg_list .msg_title{
+                width:120px;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                display: inline-block;
+            }
+            .widget_leaf_sys_msg .msg_list .list_row{
+                margin-bottom: 8px;
+                cursor: pointer;
+            }
+            .widget_leaf_sys_msg .msg_start_date{
+                font-family: PingFangSC-Regular;
+                font-size: 13px;
+                color: rgba(0,0,0,0.40);
+                position: absolute;
+                right: 20px;
+            }
+        </style>
+        <script><![CDATA[
+        function on_sys_notice_msg_ds_load(ds){
+            var records = ds.data;
+            var html='';
+            records.forEach(function(record){
+                var title = record.data["msg_title"] || '';
+                var date = record.data["msg_start_date"] || new Date;
+                var id = record.data["notice_msg_id"] || 0;
+                var source_id = record.data["source_id"] || 0;
+                var notice_type = record.data["notice_type"] || '';
+                var url = record.data["notice_url"] || '';
+                var dateStr = date.format("yyyy-mm-dd");
+                var clickJsStr = '';
+                if (notice_type == 'URL') {
+                    clickJsStr = 'openWin_sys_msg_detail_url(\'' + url + '\',' + source_id + ')';
+                } else if (notice_type == 'HTML') {
+                    clickJsStr = 'openWin_sys_msg_detail_html(' + record.get('notice_msg_id') + ')';
+                } else {
+                    clickJsStr = '';
+                }
+                html += '<div class="list_row" onclick="' + clickJsStr + '">';
+                html += '<span class="msg_title">【系统公告】' + title + '</span>';
+                html += '<span class="msg_start_date">' + dateStr + '</span>';
+                html += '</div>';
+            });
+            jQuery(".widget_leaf_sys_msg .msg_list").html(html);
+        };
+        function openWin_sys_msg_detail_url(url,instance_id){
+            new Leaf.Window({
+                id: 'sys_notice_url',
+                url: '${/request/@context_path}/modules/' + url,
+                params: {
+                    instance_id: instance_id
+                },
+                title: '明细',
+                fullScreen: true
+            });
+        }
+        function openWin_sys_msg_detail_html(notice_msg_id){
+            new Leaf.Window({
+                id: 'sys_notice_msg_html',
+                url: $('sys_notice_msg_url').getUrl(),
+                params: {
+                    notice_msg_id: notice_msg_id
+                },
+                title: '明细',
+                fullScreen: true
+            });
+        }
+        function openWin_all_sys_msg(){
+            new Leaf.Window({
+                id: 'all_sys_notice_msg',
+                url: $('all_sys_notice_msg_url').getUrl(),
+                title: '全部系统公告',
+                fullScreen: true
+            });
+        }
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="leaf_sys_notice_msg_ds" autoQuery="true" pageSize="3" model="sys.SYS8300.sys_notice_msg">
+                <a:fields>
+                    <a:field name="msg_title"/>
+                    <a:field name="msg_start_date"/>
+                    <a:field name="notice_msg_id"/>
+                </a:fields>
+                <a:events>
+                    <a:event name="load" handler="on_sys_notice_msg_ds_load"/>
+                </a:events>
+            </a:dataSet>
+        </a:dataSets>
+        <div class="widget_leaf_sys_msg">
+            <div class="header">
+                <span class="title">系统公告</span>
+                <div class="title-line"></div>
+                <!--<a href="javascript:openWin_all_sys_msg()">查看更多></a>-->
+                <img onclick="openWin_all_sys_msg()" class="more-notice-img" src="${/request/@context_path}/leafresource/images/widget/more-notice@2x.png"/>
+            </div>
+            <div class="top_msg">
+                <img class="more-notice" src="${/request/@context_path}/leafresource/images/widget/system-notice@2x.png"/>
+                <!--<div class="title">热烈庆祝公司移动端产品上线</div>-->
+            </div>
+            <div class="msg_list"> </div>
+        </div>
+        <a:screenBody style="display:none"> </a:screenBody>
+    </a:view>
+</a:screen>

src/main/webapp/home_page/WIDGET-CALCULATOR/WIDGET-CALCULATOR-CSH.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    @auth:Think
+    @version: 1.0
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application">
+    <a:init-procedure/>
+    <a:view template="default" package="leaf.ui.std">
+        <style>
+            html, body {
+                width: 291px;
+                height: 60px;
+                margin: 0;
+                padding: 0;
+            }
+
+            .widget-calculator {
+                width: 240px;
+                height: 46px;
+                background: #FFFFFF;
+                border: 0px solid #F0F0F3;
+            }
+
+            .widget-calculator div {
+            / / border: 1 px solid red;
+            }
+
+            .widget-calculator .calculator-img {
+                float: left;
+                height: 100%;
+                width: 46px;
+            }
+
+            .widget-calculator .calculator-img .img-content {
+                width: 46px;
+                margin-left: 0px;
+                height: 100%;
+
+            }
+
+            .widget-calculator .calculator-img .img-content img {
+                width: 47px;
+                /*height:60px;*/
+                margin-top: 0px;
+                border-radius: 5px;
+            }
+
+            .widget-calculator .calculator-content {
+                margin-left: 0px;
+                height: 100%;
+                float: left;
+            }
+
+            .widget-calculator .calculator-content .content-title {
+                margin-left:33px;
+                margin-top:13px;
+                width: 80px;
+                height: 16px;
+                font-family: NotoSansHans-Regular;
+                font-size: 14px;
+                font-weight: normal;
+                font-stretch: normal;
+                letter-spacing: 0px;
+                color: #333333;
+            }
+
+            .widget-calculator .right-arrow {
+                float:right;
+                margin-right:25px;
+                margin-top:16px;
+                width: 7px;
+                height: 10px;
+            }
+            .widget-calculator .right-arrow .right-arrow-img{
+                width: 5px;
+                /*height: 10px;*/
+                cursor: pointer;
+            }
+
+        </style>
+        <script><![CDATA[
+        function calculator () {
+            top.mainJumpCode('HLS500N');
+        }
+        ]]></script>
+        <div class="widget-calculator" id="widget-calculator">
+            <div class="calculator-img">
+                <div class="img-content">
+                    <img src="${/request/@context_path}/leafresource/images/home_page/leaf-calculator@2x.png"/>
+
+                </div>
+            </div>
+            <div class="calculator-content">
+                <div class="content-title">租金计算器</div>
+            </div>
+            <div class="right-arrow" onclick="calculator()">
+                <img class="right-arrow-img" src="${/request/@context_path}/leafresource/images/home_page/detail-arrow@2x.png"/>
+            </div>
+        </div>
+        <a:screenBody style="display:none">
+
+        </a:screenBody>
+    </a:view>
+</a:screen>
\ No newline at end of file

src/main/webapp/home_page/WIDGET-CALCULATOR/WIDGET-CALCULATOR.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    @auth:Think
+    @version: 1.0
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application">
+    <a:init-procedure/>
+    <a:view template="default" package="leaf.ui.std">
+        <style>
+            html, body {
+                width: 264px;
+                height: 72px;
+                margin: 0;
+                padding: 0;
+            }
+
+            .widget-calculator {
+                width: 264px;
+                height: 72px;
+                background: #FFFFFF;
+                border: 1px solid #F0F0F3;
+                cursor: pointer;
+            }
+
+            .widget-calculator div {
+            / / border: 1 px solid red;
+            }
+
+            .widget-calculator .calculator-img {
+                float: left;
+                height: 100%;
+                width: 53px;
+            }
+
+            .widget-calculator .calculator-img .img-content {
+                width: 33px;
+                border-top: 4px solid rgba(90, 127, 255, 1);
+                margin-left: 20px;
+                height: 100%;
+
+            }
+
+            .widget-calculator .calculator-img .img-content img {
+                width: 33px;
+                margin-top: 12px;
+
+            }
+
+            .widget-calculator .calculator-content {
+                margin-left: 20px;
+                height: 100%;
+                float: left;
+            }
+
+            .widget-calculator .calculator-content .content-title {
+                font-size: 14px;
+                color: rgba(75, 80, 90, 0.85);
+                letter-spacing: 0;
+                margin-top: 15px;
+            }
+
+            .widget-calculator .calculator-content .content-sub {
+                font-size: 12px;
+                color: rgba(75, 80, 90, 0.75);
+                letter-spacing: 0;
+                margin-top: 4px;
+            }
+
+            .widget-calculator .widget-calculator-img {
+                margin-top: 31px;
+                margin-left: 227px;
+                width: 37px;
+                height: 41px;
+                background-image: url("${/request/@context_path}/leafresource/images/home_page/calculator@2x.png");
+                background-repeat: no-repeat;
+                filter: alpha(opacity=30);
+                -moz-opacity: 0.3;
+                -khtml-opacity: 0.3;
+                opacity: 0.3;
+
+            }
+
+
+        </style>
+        <script><![CDATA[
+        function calculator () {
+            top.mainJumpCode('HLS500N');
+        }
+        ]]></script>
+        <div class="widget-calculator" id="widget-calculator" onclick="calculator()">
+            <div class="calculator-img">
+                <div class="img-content">
+                    <img src="${/request/@context_path}/leafresource/images/home_page/calculator@2x.png"/>
+
+                </div>
+            </div>
+            <div class="calculator-content">
+                <div class="content-title">租金计算器</div>
+                <div class="content-sub">计算项目合同每期租金</div>
+            </div>
+            <div class="widget-calculator-img">
+
+            </div>
+
+        </div>
+        <a:screenBody style="display:none">
+
+        </a:screenBody>
+    </a:view>
+</a:screen>
\ No newline at end of file

src/main/webapp/home_page/WIDGET-CONTRACT/WIDGET-CONT-CF-CNY.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    微件-项目资金流动情况-人民币
+    widget_cont_cf_cny
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application">
+    <a:init-procedure/>
+    <a:view template="default" package="leaf.ui.std">
+        <!--单独微件测试用-->
+        <!--<script src="${/request/@context_path}/leafresource/js/attach/g2.min.js"></script>-->
+        <style>
+            html,body{
+            width:264px;
+            height:456px;
+            margin: 0;
+            padding: 0;
+            color:#000;
+            }
+            .widget_cont_cf_cny{
+            box-sizing:border-box;
+            width:264px;
+            height:456px;
+            background-color:#fff;
+            position:relative;
+            border:1px solid #F0F0F3;
+            cursor:default;
+            }
+            .widget_cont_cf_cny .widget_label{
+            position:absolute;
+            width:40px;
+            height:4px;
+            top:0;
+            left:16px;
+            background-color: #FFD95B;
+            }
+            .widget_cont_cf_cny .icon{
+            height:16px;
+            margin-right:8px;
+            }
+            .widget_cont_cf_cny .row1{
+            width:100%;
+            height:20px;
+            line-height:20px;
+            padding:16px 0 8px 16px;
+            border-bottom:1px solid #F0F0F3;
+            font-family: PingFangSC-Medium;
+            font-size: 14px;
+            color: rgba(75,80,90,0.85);
+            }
+            .widget_cont_cf_cny .row2{
+            box-sizing:border-box;
+            width:100%;
+            height:133px;
+            padding:0 32px 0 32px;
+            border-bottom:1px solid #F0F0F3;
+            }
+            .widget_cont_cf_cny .row2 .title{
+            position:relative;
+            margin:8px 0 16px 0;
+            height:17px;
+            line-height:17px;
+            font-family: PingFangSC-Medium;
+            font-size: 12px;
+            color: #535D7F;
+            }
+            .widget_cont_cf_cny .row2 .title .icon{
+            position:relative;
+            top:4px;
+            }
+            .widget_cont_cf_cny .list{
+            height:20px;
+            margin-bottom:8px;
+            }
+            .widget_cont_cf_cny .list .left{
+            display:inline-block;
+            width:68px;
+            height:20px;
+            line-height:20px;
+            border-right:1px solid #F0F0F3;
+            font-family: PingFangSC-Regular;
+            font-size: 12px;
+            color: rgba(0,0,0,0.65);
+            }
+            .widget_cont_cf_cny .list .right{
+            display:inline-block;
+            height:20px;
+            margin-left:30px;
+            line-height:20px;
+            font-family: PingFangSC-Regular;
+            font-size: 12px;
+            color: rgba(0,0,0,0.65);
+            }
+            .widget_cont_cf_cny .row3{
+            box-sizing:border-box;
+            width:100%;
+            height:112px;
+            padding:16px 32px 0 32px;
+            border-bottom:1px solid #F0F0F3;
+            }
+            .widget_cont_cf_cny .row3 #overdue_per{
+            background: rgba(255,217,91,0.20);
+            border-radius: 2px;
+            padding: 0 10px;
+            font-family: PingFangSC-Regular;
+            font-size: 12px;
+            color: #CC8134;
+            }
+            .widget_cont_cf_cny .row4{
+            box-sizing:border-box;
+            width:100%;
+            height:156px;
+            padding:0 0 0 32px;
+            }
+            .widget_cont_cf_cny .row4 .left{
+            box-sizing:border-box;
+            height:100%;
+            float:left;
+            padding-top:32px;
+            }
+            .widget_cont_cf_cny .row4 .left p{
+            font-family: PingFangSC-Regular;
+            font-size: 12px;
+            color: rgba(0,0,0,0.65);
+            line-height: 20px;
+            margin:0;
+            }
+            .widget_cont_cf_cny .row4 .left p:nth-child(2){
+            margin-bottom:8px;
+            }
+            .widget_cont_cf_cny .row4 .right{
+            box-sizing:border-box;
+            height:100%;
+            float:left;
+            width:164px;
+            height:156px;
+            text-align:center;
+            }
+            .widget_cont_cf_cny .row4 .clearFloat{
+            clear:both;
+            height:0;
+            line-height:0;
+            font-size:0
+            }
+        </style>
+        <script><![CDATA[
+        function cont_cf_cny_loader(ds){
+            var record=ds.data[0],
+                contract_count=record.data["contract_count"],
+                contract_amount=record.data["contract_amount"],
+                overdue_amount=record.data["overdue_amount"],
+                pay_amount=record.data["pay_amount"],
+                rec_amount=record.data["rec_amount"];
+            overdue_amount=1000;
+            var overdue_per = contract_amount == 0 ? '0.00%' : Math.round(overdue_amount/contract_amount*10000)/100+'%';
+            var rec_pay_per = pay_amount == 0 ? '0.00%' : Math.round(rec_amount/pay_amount*10000)/100+'%';
+            jQuery(".widget_cont_cf_cny #contract_count").text(contract_count);
+            jQuery(".widget_cont_cf_cny #contract_amount").text(contract_amount);
+            jQuery(".widget_cont_cf_cny #overdue_amount").text(overdue_amount);
+            jQuery(".widget_cont_cf_cny #overdue_per").text(overdue_per);
+            jQuery(".widget_cont_cf_cny #pay_amount").text(pay_amount);
+            jQuery(".widget_cont_cf_cny #rec_amount").text(rec_amount);
+            // 关闭 G2 的体验改进计划打点请求
+            G2.track(false);
+            var chart = new G2.Chart({
+              container: 'pay_rec_cny_pic',
+              width:164,
+              height:156,
+              animate: false,
+              padding:10
+            });
+            chart.source([{
+                item:'投放金额',
+                amount:pay_amount
+            },{
+                item:'回笼金额',
+                amount:rec_amount
+            }]);
+            chart.coord('theta', {
+              radius: 0.75,
+              innerRadius: 0.72
+            });
+            chart.tooltip({
+              showTitle: false,
+              itemTpl: '<li><span style="background-color:{color};" class="g2-tooltip-marker"></span>{name}: {value}</li>'
+            });
+            chart.guide().html({
+              position: ['50%', '50%'],
+              html: '<div style="font-family: Baskerville;font-size: 14px;color: rgba(75,80,90,0.85);text-align:center;width: 10em;">' + rec_pay_per + '</div>',
+              alignX: 'middle',
+              alignY: 'middle'
+            });
+              chart.legend(false);
+            var interval = chart.intervalStack()
+            .position('amount')
+            .color('item',['#FFD95B','#F0F2F5'])
+            .tooltip('item*amount', function(item, amount) {
+              return {
+                name: item,
+                value: amount
+              };
+            }).style({
+              lineWidth: 1,
+              stroke: '#fff'
+            });
+            chart.render();
+        }
+            ]]></script>
+        <a:dataSets>
+            <a:dataSet id="cont_cf_cny_ds" autoQuery="true" pageSize="5" model="cont.CON1003.cont_cf_cny" >
+                <a:fields>
+                    <a:field name="contract_count"/>
+                    <a:field name="contract_amount"/>
+                    <a:field name="overdue_amount"/>
+                    <a:field name="pay_amount"/>
+                    <a:field name="rec_amount"/>
+                </a:fields>
+                <a:events>
+                    <a:event name="load" handler="cont_cf_cny_loader"/>
+                </a:events>
+            </a:dataSet>
+        </a:dataSets>
+        <div class="widget_cont_cf_cny">
+            <span class="widget_label"> </span>
+            <div class="row1">项目资金流动情况</div>
+            <div class="row2">
+                <div class="title">
+                    <img src="${/request/@context_path}/leafresource/images/widget/cny.png" class="icon"/>
+                    <span>人民币(￥)</span>
+                </div>
+                <div class="list">
+                    <span class="left">项目总数</span>
+                    <span class="right" id="contract_count"> </span>
+                </div>
+                <div class="list">
+                    <span class="left">双名单</span>
+                    <span class="right" > </span>
+                </div>
+                <div class="list">
+                    <span class="left">转化率</span>
+                    <span class="right" > </span>
+                </div>
+            </div>
+            <div class="row3">
+                <div class="list">
+                    <span class="left">未收金额</span>
+                    <span class="right" id="contract_amount"> </span>
+                </div>
+                <div class="list">
+                    <span class="left">逾期金额</span>
+                    <span class="right" id="overdue_amount"> </span>
+                </div>
+                <div class="list">
+                    <span class="left">逾期比例</span>
+                    <span class="right" id="overdue_per"> </span>
+                </div>
+            </div>
+            <div class="row4">
+                <div class="left">
+                    <p>投放金额</p>
+                    <p id="pay_amount"></p>
+                    <p>回笼金额</p>
+                    <p id="rec_amount"></p>
+                </div>
+                <div class="right" id="pay_rec_cny_pic">
+
+                </div>
+                <div class="clearFloat"> </div>
+            </div>
+        </div>
+        <a:screenBody style="display:none"> </a:screenBody>
+    </a:view>
+</a:screen>
\ No newline at end of file

src/main/webapp/home_page/WIDGET-CONTRACT/WIDGET-CONTRACT.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    $Author: hty
+    $Date: 2018/6/5 17:18
+    $Revision: 1.0 
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application">
+    <a:init-procedure/>
+    <a:view template="default" package="leaf.ui.std">
+
+
+        <script><![CDATA[
+            function contract_number_template(rowdata) {
+            return "<p style='margin: 0;padding: 0px;'>"+rowdata.data.contract_number+"</p><p style='margin: 0px;padding: 0px;'>"+rowdata.data.contract_name+"</p>";
+            }
+        ]]></script>
+
+        <a:dataSets>
+            <a:dataSet id="widget_contract_ds" pageSize="5" autoQuery="true" model="home.con_contract_query">
+                <a:fields>
+                </a:fields>
+            </a:dataSet>
+        </a:dataSets>
+
+        <a:hapGrid id="widget_contract_ds_grid" title="合同信息" bindTarget="widget_contract_ds" titleImg="resources/images/home_page/search.png">
+            <a:columns>
+                <a:column name="contract_number" prompt="合同编号/名称" width="150" template="contract_number_template"/>
+                <a:column name="bp_name" prompt="承租人" width="200"/>
+                <a:column name="document_type_desc"  prompt="合同类型"/>
+                <a:column name="finance_amount"  prompt="融资额" />
+                <a:column name="contract_status_desc"  prompt="合同状态" />
+            </a:columns>
+        </a:hapGrid>
+
+
+    </a:view>
+</a:screen>

src/main/webapp/home_page/WIDGET509/WIDGET509.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    $Author: huangtianyang
+    $Date: 2018/7/2 上午11:00
+    $Revision: 1.0 
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application">
+    <a:init-procedure/>
+    <a:view template="default" package="leaf.ui.std">
+        <div></div>
+        <script></script>
+        <a:dataSets/>
+
+        <a:screenBody style="display:none;"/>
+    </a:view>
+</a:screen>
\ No newline at end of file