农行背景颜色及跳转调整

src/main/webapp/modules/csh/CSH1400/agricultural_bank_import.lview

@@ -50,12 +50,13 @@
             });
             new Ext.Template('<iframe id ="_input_window" name="_input_window" border="0" frameborder="0" height="100%"  width="100%"  style="border:none;padding:0px;margin:0px;"></iframe>').insertFirst(_input_window.body.dom, {}, true);
             var form = document.getElementById('importForm');
-            var url = '${/request/@context_path}/modules/csh/CSH1400/csh_abc_excel_import.lview?session_id=${/parameter/@session_id}&winid=${/parameter/@winid}&abc_ds=${/parameter/@abc_ds}&batch_id=${/parameter/@batch_id}&_csrf=${/session/@_csrf.token}';
+            var url = '${/request/@context_path}/modules/csh/CSH1400/csh_abc_excel_import.lview?session_id=${/parameter/@session_id}&winid=${/parameter/@winid}&abc_ds=${/parameter/@abc_ds}&ocr_ds=${/parameter/@ocr_ds}&batch_id=${/parameter/@batch_id}&_csrf=${/session/@_csrf.token}';
             form.action = url;
             form.submit();
             $('${/parameter/@winid}').close();
             _input_window.on('close', function() {
                 $('${/parameter/@abc_ds}').query();
+                $('${/parameter/@ocr_ds}').query();
             });
         }
         ]]></script>

src/main/webapp/modules/csh/CSH1400/csh_agricultural_bank_check.lview

@@ -54,8 +54,8 @@
         // var record = $('AbcBankDs').getSelected();
 
         function change_background_color(record) {
-            if (record.get('re_flag') == 'Y') {
-                return 'background-color:#DC143C;'
+            if (record.get('re_flag') == 'N') {
+                return 'background-color:#99FF99;'
             }
         }
         // 字段渲染农行回单
@@ -65,11 +65,11 @@
                 var value_r = record.get(name_r);//OCR数据
                 if (value != value_r) {
                     if (name == 'total_amount') {
-                        return '<font color="yellow">' + Leaf.formatMoney(value) + '</font>'
+                        return '<font color="red">' + Leaf.formatMoney(value) + '</font>'
                     } else if (name == 'bank_receipt_date') {
-                        return '<font color="yellow">' + Leaf.formatDate(value) + '</font>'
+                        return '<font color="red">' + Leaf.formatDate(value) + '</font>'
                     } else {
-                        return '<font color="yellow">' + value + '</font>'
+                        return '<font color="red">' + value + '</font>'
                     }
                 } else {
                     if (name == 'total_amount') {
@@ -185,7 +185,7 @@
                                 });
                                 $('AbcBankDs').query();
                                 $("OcrQueryDs").query();
-                                returnBack();
+                                // returnBack();
                             },
                             scope: this
                         });
@@ -203,7 +203,7 @@
                             });
                             $('AbcBankDs').query();
                             $("OcrQueryDs").query();
-                            returnBack();
+                            // returnBack();
                         },
                         scope: this
                     });
@@ -223,6 +223,7 @@
                 params: {
                     winid: 'agricultural_bank_import_wind',
                     abc_ds:'AbcBankDs',
+                    ocr_ds:'OcrQueryDs',
                 },
                 url: $('agricultural_bank_import_link').getUrl(),
                 title: '农行回单',
@@ -298,6 +299,7 @@
                             <a:map from="bp_name" to="beneficiary_name"/>
                             <a:map from="bp_id" to="bp_id"/>
                             <a:map from="extra_nam" to="extra_nam"/>
+                            <a:map from="bp_category" to="bp_category"/>
                         </a:mapping>
                     </a:field>
 
@@ -341,7 +343,7 @@
                                 <a:column name="receipt_no" prompt="回单编号" width="80" align="left"/>
                                 <a:column name="payer_number" prompt="付款方账号" width="100" align="center" renderer="checkOcrRender"/>
                                 <a:column name="payer_name" prompt="付款方户名" width="100" align="left" renderer="checkOcrRender"/>
-                                <a:column name="payer_bank" prompt="付款方开户行" width="100" align="left" renderer="checkOcrRender"/>
+                                <a:column name="payer_bank" prompt="付款方开户行" width="100" align="left"/>
                                 <a:column name="bp_name" prompt="收款对象" width="100" align="left"/>
                                 <a:column name="paid_byother_flag_desc" prompt="是否代付" width="70" align="center"/>
                                 <a:column name="total_amount" prompt="金额" width="100" align="right" renderer="checkOcrRender"/>
@@ -366,8 +368,7 @@
                                 <a:column name="payer_number" prompt="对方账号" width="100"  align="center" renderer="checkOcrRender"/>
                                 <a:column name="payer_name" prompt="对方账号户名" width="100"  align="left"
                                           renderer="checkOcrRender"/>
-                                <a:column name="bank_name" prompt="对方银行名称" width="100"  align="left"
-                                          renderer="checkOcrRender"/>
+                                <a:column name="bank_name" prompt="对方银行名称" width="100"  align="left"/>
                                 <a:column name="beneficiary_name" prompt="收款对象" width="100" editor="grid_lov" align="left" required="true"/>
                                 <a:column name="paid_byother_flag_desc" prompt="是否代付" width="70" editor="grid_cb"
                                           required="true"