Merge branch 'feature/write_off_ref' into develop

src/main/webapp/WEB-INF/classes/csh/CSH514/csh_write_off.lwm

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="CSH_WRITE_OFF">
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="CSH_WRITE_OFF" defaultOrderBy="t1.write_off_id desc">
     <bm:fields>
         <bm:field name="write_off_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="WRITE_OFF_ID" prompt="CSH_WRITE_OFF.WRITE_OFF_ID"/>
         <bm:field name="write_off_type" databaseType="VARCHAR2" datatype="java.lang.String" lookupCode="CSH513_WRITE_OFF_TYPE" lookupField="write_off_type_name" physicalName="WRITE_OFF_TYPE" prompt="CSH_WRITE_OFF.WRITE_OFF_TYPE"/>

src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_query.lwm

@@ -168,8 +168,9 @@
     </bm:query-fields>
     <bm:data-filters>
         <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
+        <bm:data-filter name="query" expression="(not exists(select 1 from csh_transaction t where t.transaction_type = 'RECEIPT' and t.paid_byother_flag = 'T' and t.write_off_flag = 'FULL' and t.transaction_id = t1.transaction_id))"/>
 <!--        <bm:data-filter name="type" expression="t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT') and t1.returned_flag != 'FULL' and t1.reversed_flag = 'N' and nvl(t1.deposit_flag,'N')='N' "/>-->
-        <bm:data-filter name="query" expression="(t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT') and t1.returned_flag != 'FULL' and nvl(t1.deposit_flag,'N')='N' and t1.confirmed_flag in ('WF_APPROVING','ACCAUDITED','APPROVED','WF_REJECTED')) "/>
+        <bm:data-filter name="query" expression="(t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT',DECODE(t1.source_type,NULL,'DEPOSIT',NULL)) and t1.returned_flag != 'FULL' and t1.confirmed_flag in ('WF_APPROVING','ACCAUDITED','APPROVED','WF_REJECTED')) "/>
         <bm:data-filter name="position_code" expression="(((${@position_code} = '009' and t1.bp_category = 'TENANT' and t1.paid_byother_flag = 'N') or (${@position_code} = '014' and t1.bp_category != 'TENANT') or (${@position_code} = '014' and t1.paid_byother_flag != 'N') and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1))" />
     </bm:data-filters>
 </bm:model>
\ No newline at end of file

src/main/webapp/modules/csh/CSH509/csh_transaction_receipt_confirm.lview

@@ -81,7 +81,7 @@
                         Leaf.showMessage('${l:PROMPT}', '操作成功！');
                         $('csh509_csh_trx_bank_business_confirm').enable();
                         $('csh509_csh_trx_bank_refuse').enable();
-                        $('csh509_csh_trx_bank_drop').enable();
+                        // $('csh509_csh_trx_bank_drop').enable();
                     }, failure: function () {
                         unlock_current_window();
                         $('csh509_csh_trx_bank_business_confirm').enable();

src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview

@@ -47,8 +47,8 @@
             for(var i=0;i<datas.length;i=i+1) {
                 var confirmed_flag= datas[i].get('confirmed_flag');
                 //不是新增就报错
-                if(confirmed_flag!='NEW'&&confirmed_flag!=undefined){
-                    $L.showInfoMessage("提示", '请选择单据为未提交的数据', null, null);
+                if(confirmed_flag!='NEW'&&confirmed_flag!='CT_REJECTED'){
+                    $L.showInfoMessage("提示", '请选择单据为新建或收款退回的数据', null, null);
                     return;
                 }
                 //将对象封装到json对象数组
@@ -107,8 +107,8 @@
                     return;
                 }
                 //不是新增就报错
-                if (confirmed_flag != 'NEW' && confirmed_flag != undefined) {
-                    $L.showInfoMessage("提示", '请选择单据为未提交的数据', null, null);
+                if (confirmed_flag != 'NEW' && confirmed_flag != 'CT_REJECTED') {
+                    $L.showInfoMessage("提示", '请选择单据为新建或收款退回的数据', null, null);
                     $('csh510_csh_trx_bank_apply_new').enable();
                     return;
                 }

src/main/webapp/modules/csh/CSH511/csh_transaction_receipt.lview

@@ -482,8 +482,8 @@
                     </a:field>
                     <a:field name="bp_bank_account_num"/>
                     <a:field name="bp_bank_account_name" required="true"/>
-                    <a:field name="collection_classes" required="true"/>
-                    <a:field name="collection_classes_desc" required="true" options="ds_collection_classes_ds"
+                    <a:field name="collection_classes" />
+                    <a:field name="collection_classes_desc" required="true" options="ds_collection_classes_ds" prompt="款项用途"
                              displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
                     <a:field name="paid_byother_flag_n" options="PAID_BYOTHER_FLAG_DS" returnField="paid_byother_flag"
                              displayField="code_value_name" valueField="code_value" required="true"/>

src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview

@@ -116,7 +116,7 @@
             var sum = 0;
             var sum_2 = 0;
             for (var i = 0; i < datas.length; i++) {
-                record = datas[i];
+                var record = datas[i];
                 if (name == "write_off_amount") {
                     var t_1 = record.get("write_off_amount");
                     var t_2 = parseFloat(t_1);
@@ -351,7 +351,7 @@
         }
 
         function csh531n_write_off_return() {
-            $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord();
+            var record = $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord();
             $('csh531n_write_off_return_btn_id').disable();
             Leaf.Masker.mask(Ext.getBody());
             Leaf.request({
@@ -382,7 +382,7 @@
         }
 
         function csh531_submitsuccess(ds) {
-            $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord();
+            var record = $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord();
             Leaf.Masker.mask(Ext.getBody());
             Leaf.request({
                 url: $('csh531n_submit_link_id').getUrl(),
@@ -391,10 +391,6 @@
                     flag: 'SUBMIT'
                 },
                 success: function () {
-                    // Leaf.SideBar.show({
-                    //     msg: '操作成功',
-                    //     duration: 2000
-                    // });
                     Leaf.Masker.unmask(Ext.getBody());
                     $('csh531n_write_off_submit_btn_id').enable();
                     $('${/parameter/@winid}').close();
@@ -409,11 +405,12 @@
                 },
                 scope: this
             });
+            // $('csh531n_write_off_submit_btn_id').enable();
             // ds.query();
         }
 
         function csh531_submitfailed(ds) {
-
+            $('csh531n_write_off_submit_btn_id').enable();
         }
 
         function compareDate(start, end) {
@@ -481,7 +478,6 @@
                 $('csh_transaction_advanced_ds').submit();
                 $('csh_write_off_interface_ds').submit();
             }
-            $('csh531n_write_off_submit_btn_id').enable();
         }
 
         function checkAmount(type) {