Merge branch 'feature/optimization' into develop

src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm

@@ -109,6 +109,7 @@
     <bm:data-filters>
         <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
         <bm:data-filter name="query" expression="(t1.transaction_type not in ('PAYMENT') and t1.reversed_flag = 'N')"/>
+        <bm:data-filter name="query" expression="(t1.returned_flag != 'RETURN')"/>
     </bm:data-filters>
     <bm:query-fields>
         <bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>

src/main/webapp/WEB-INF/classes/csh/CSH515/csh_transaction_receipt_return_query.lwm

@@ -108,8 +108,9 @@
         <bm:pk-field name="transaction_id"/>
     </bm:primary-key>
     <bm:data-filters>
-        <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id} and t1.posted_flag=&apos;Y&apos; and t1.reversed_flag=&apos;N&apos; and write_off_flag&lt;&gt; &apos;FULL&apos; and returned_flag not in ( &apos;FULL&apos;,&apos;RETURN&apos;) and t1.transaction_type in (&apos;RECEIPT&apos;,&apos;ADVANCE_RECEIPT&apos;) and  (nvl(t1.returned_amount, 0)+nvl(t1.write_off_amount, 0)&lt;t1.transaction_amount)) "/>
-        <bm:data-filter name="query" expression="(t1.confirmed_flag not in (&apos;ACCAUDITING&apos;,&apos;NEW&apos;,&apos;CT_REJECTED&apos;) and t1.write_off_flag in(&apos;NOT&apos;,&apos;PARTIAL&apos;))"/>
+        <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id} and t1.posted_flag=&apos;Y&apos; and t1.reversed_flag=&apos;N&apos;  and returned_flag not in ( &apos;RETURN&apos;) and t1.transaction_type in (&apos;RECEIPT&apos;,&apos;ADVANCE_RECEIPT&apos;) and  (nvl(t1.returned_amount, 0)+nvl(t1.write_off_amount, 0)&lt;=t1.transaction_amount)) "/>
+<!--        <bm:data-filter name="query" expression="(t1.confirmed_flag not in (&apos;ACCAUDITING&apos;,&apos;NEW&apos;,&apos;CT_REJECTED&apos;) and t1.write_off_flag in(&apos;NOT&apos;,&apos;PARTIAL&apos;))"/>-->
+        <bm:data-filter name="query" expression="(t1.confirmed_flag not in (&apos;ACCAUDITING&apos;,&apos;NEW&apos;,&apos;CT_REJECTED&apos;))"/>
     </bm:data-filters>
     <bm:query-fields>
         <bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>

src/main/webapp/modules/ccb/CCB600/ccb_ebank_manager.lview

@@ -270,7 +270,7 @@
             }
             var str;
             var pay_method = record.get('pay_method');
-            var due_date_to = record.get('due_date');
+            var due_date_to = new Date(record.get('due_date')).format('yyyy-mm-dd').toString();
             var bank_type;
             if (pay_method == 'CCB_THREE') {
                 bank_type = 'CCB';

src/main/webapp/modules/csh/CSH515/csh_transaction_receipt_return_maintain.lview

@@ -197,7 +197,7 @@
                         if (check_flag == 'Y' || check_flag == 'D' || check_flag == 'R'){
                             Leaf.showMessage('提示','已经有工作流在审批中');
                         }else{
-                            if (transaction_amount <=0){
+                            if (can_returned_amount <=0){
                                 Leaf.showMessage('提示','该笔收款没有金额可以被退还');
                                 return;
                             }

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

@@ -324,7 +324,7 @@
 
             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') {
+                    if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' &&  key != 'project_id') {
                         if(!bp_tenant_detail_r.get(key)){
                             Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方信用度\"外，其他都为必输字段，请填写！");
                             bp_rate_flag = false;

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

@@ -852,7 +852,7 @@
                     param['url_title'] = '客户评分明细';
                     var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
                     var r = $(score_ds_id).getCurrentRecord();
-                    if (r.dirty) {
+                    if (r.dirty && '${/parameter/@function_usage}' == 'MODIFY') {
                         Leaf.showInfoMessage('提示', '评分数据发生修改，请先保存再进行评分');
                         return;
                     }
@@ -938,7 +938,8 @@
 
             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') {
+                    if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' &&  key != 'project_id') {
+                        debugger;
                         if(!bp_tenant_detail_r.get(key)){
                             Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方信用度\"外，其他都为必输字段，请填写！");
                             bp_rate_flag = false;

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

@@ -355,10 +355,10 @@
                     param['url_title'] = '客户评分明细';
                     var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
                     var r = $(score_ds_id).getCurrentRecord();
-                    if (r.dirty) {
-                        Leaf.showInfoMessage('提示', '评分数据发生修改，请先保存再进行评分');
-                        return;
-                    }
+                    // if (r.dirty) {
+                    //     Leaf.showInfoMessage('提示', '评分数据发生修改，请先保存再进行评分');
+                    //     return;
+                    // }
                     if ($(ds_id).validate()) {
                         var win = new Leaf.Window({
                             id: param['winid'],

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

@@ -298,7 +298,7 @@
 
             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') {
+                    if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' &&  key != 'project_id') {
                         if(!bp_tenant_detail_r.get(key)){
                             Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方信用度\"外，其他都为必输字段，请填写！");
                             bp_rate_flag = false;