[refactor]核销确认及其他BUG

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

@@ -90,7 +90,7 @@
                     },
                     scope: this
                 });
-            })
+            },function(){$('csh509_csh_trx_bank_business_confirm').enable();})
 
         }
 
@@ -100,11 +100,17 @@
             $('csh509_csh_trx_bank_business_confirm').disable();
             //根据身份判断所选择的数据是否可以确认
             var datas = $('csh_transaction_receipt_maintain_result_ds').selected;
+            if(datas.length == 0){
+                Leaf.showInfoMessage("提示","请先选择数据");
+                $('csh509_csh_trx_bank_business_confirm').enable();
+                return;
+            }
             var updateData = [];
             for (var i = 0; i < datas.length; i++) {
                 var confirmed_flag = datas[i].get('confirmed_flag');
                 if (confirmed_flag != 'ACCAUDITING' && confirmed_flag != 'DEBTAUDITING') {
                     $L.showInfoMessage("提示", '请选择确认中的收款单据');
+                    $('csh509_csh_trx_bank_business_confirm').enable();
                     return;
                 }
                 //
@@ -127,7 +133,7 @@
                 //   }
                 //保存要修改的数据
                 //岗位
-                confirmed_by = '00321';
+                confirmed_by = '014';
                 updateData.push({
                     transaction_id: datas[i].get('transaction_id'),
                     wanted_confirmed_flag: 'ACCAUDITED',
@@ -531,7 +537,11 @@
             </a:dataSet>
             <a:dataSet id="write_off_flag_ds" lookupCode="WRITE_OFF_FLAG"/>
 
-            <a:dataSet id="confirmed_flag_ds" lookupCode="CONFIRMED_FLAG">
+            <a:dataSet id="confirmed_flag_ds">
+                <a:datas>
+                    <a:record code_value="ACCAUDITING" code_value_name="收款确认中"/>
+                    <a:record code_value="ACCAUDITED" code_value_name="收款已确认"/>
+                </a:datas>
             </a:dataSet>
             <a:dataSet id="payment_method_ds">
                 <a:datas dataSource="/model/payment_method_path"/>
@@ -615,7 +625,8 @@
                         </a:mapping>
                     </a:field>
                     <a:field name="confirmed_flag_desc" options="confirmed_flag_ds" valueField="code_value"
-                             displayField="code_value_name" returnField="confirmed_flag"/>
+                             displayField="code_value_name" returnField="confirmed_flag" defaultValue="收款确认中"/>
+                    <a:field name="confirmed_flag" defaultValue="ACCAUDITING"/>
                     <a:field name="payment_method_display" displayField="description" options="payment_method_ds"
                              returnField="payment_method_id" valueField="payment_method_id"/>
                     <a:field name="bp_name_from" lovGridHeight="350" lovHeight="500"
@@ -810,7 +821,7 @@
                         <a:lov name="bp_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
                                prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER"/>
                         <a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds"
-                                    prompt="CSH510.CSH_TRANSACTION.BILL_STATUS"/>
+                                    prompt="单据审批状态"/>
                         <!--                        <a:comboBox name="write_off_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"/>-->
                         <a:comboBox name="collection_classes_n" bindTarget="csh_transaction_receipt_maintain_query_ds"
                                     prompt="CSH510.CSH_TRANSACTION.PURPOSE_OF_FUNDS"/>
@@ -843,10 +854,10 @@
                         <a:column name="bp_name" prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER" align="center"/>
                         <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"/>
                         <a:column name="description" prompt="CSH510.CSH_TRANSACTION.DESCRIPTION" align="center"/>
-                        <a:column name="confirmed_flag_desc" prompt="CSH510.CSH_TRANSACTION.BILL_STATUS"
-                                  align="center"/>
-                        <a:column name="written_off_flag_desc" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"
+                        <a:column name="confirmed_flag_desc" prompt="单据审批状态"
                                   align="center"/>
+<!--                        <a:column name="written_off_flag_desc" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"-->
+<!--                                  align="center"/>-->
                         <a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT" align="center">
                             <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name"
                                       align="center"/>