Merge branch 'feature/je_ref' into develop

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

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_id desc" needAccessControl="false">
+<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_date desc" needAccessControl="false">
     <bm:fields>
         <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
         <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>

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

@@ -251,7 +251,7 @@
                 } else {
                     return value;
                 }*/
-                if(record.get('receipt_type')=='IMPORT'&&record.get('bp_name')==null&&record.get('confirmed_flag')=='NEW'){
+                if(record.get('confirmed_flag')=='NEW' || record.get('confirmed_flag') == 'CT_REJECTED'){
                     url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=true';
                 }else{
                     url = $('csh_transaction_receipt_maintain_readonly_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=false';
@@ -306,6 +306,10 @@
             }
             var saveData = [];
             for (var i = 0; i < records.length; i++) {
+                if(records[i].get('confirmed_flag') != 'NEW' && records[i].get('confirmed_flag') != 'CT_REJECTED'){
+                    Leaf.showInfoMessage("提示","请选择新建或者收款退回的单据进行收款取消操作！");
+                    return;
+                }
                 records[i].set('_status', 'delete');
                 saveData.push(records[i].data);
             }
@@ -482,11 +486,18 @@
 
         ]]></script>
         <a:dataSets>
-            <a:dataSet id="write_off_flag_ds" lookupCode="WRITE_OFF_FLAG"/>
-            <a:dataSet id="bp_category_ds" lookupCode="BP_CATEGORY">
+            <a:dataSet id="confirmed_flag_ds">
+                <a:datas>
+                    <a:record code_value="NEW" code_value_name="新建"/>
+                    <a:record code_value="ACCAUDITING" code_value_name="收款确认中"/>
+                    <a:record code_value="CT_REJECTED" code_value_name="收款退回"/>
+                    <a:record code_value="ACCAUDITED" code_value_name="收款已确认"/>
+                </a:datas>
             </a:dataSet>
-            <a:dataSet id="confirmed_flag_ds" lookupCode="CONFIRMED_FLAG">
+            <a:dataSet id="bp_category_ds" lookupCode="BP_CATEGORY">
             </a:dataSet>
+<!--            <a:dataSet id="confirmed_flag_ds" lookupCode="CONFIRMED_FLAG">-->
+<!--            </a:dataSet>-->
             <a:dataSet id="payment_method_ds">
                 <a:datas dataSource="/model/payment_method_path"/>
             </a:dataSet>
@@ -678,9 +689,9 @@
                 <a:gridButton click="csh510_receipt_query" text="HLS.QUERY" id="csh510_receipt_query"/>
                 <a:gridButton click="csh510_csh_trx_bank_import" text="CSH510.CSH_TRANSACTION.RECEIVE_MONEY_IMPORT_BTN" id="csh510_csh_trx_bank_import"/>
                 <a:gridButton click="csh510_csh_trx_bank_hand_add" text="CSH510.CSH_TRANSACTION.MONEY_HAND_ADD_BTN" id="csh510_csh_trx_bank_hand_add"/>
-                <!--<a:gridButton click="csh510_receipt_remove" text="HLS.REMOVE"/>-->
-                <a:gridButton click="csh510_csh_trx_bank_apply_new" text="CSH510.CSH_TRANSACTION.APPLY_NEW_BTN" id="csh510_csh_trx_bank_apply_new"/>
-                <a:gridButton click="csh510_csh_trx_bank_drop" text="CSH510.CSH_TRANSACTION.DROP_BTN" id="csh510_csh_trx_bank_drop"/>
+                <a:gridButton click="csh510_receipt_remove" text="收款取消"/>
+<!--                <a:gridButton click="csh510_csh_trx_bank_apply_new" text="提交复核" id="csh510_csh_trx_bank_apply_new"/>-->
+<!--                <a:gridButton click="csh510_csh_trx_bank_drop" text="CSH510.CSH_TRANSACTION.DROP_BTN" id="csh510_csh_trx_bank_drop"/>-->
                 <a:gridButton click="csh510_receipt_reset" text="HLS.RESET"/>
                 <!--  <a:gridButton click="csh510_csh_transaction_batch_update" text="批量过账"/>-->
                 <!-- <a:gridButton click="csh510_receipt" text="财务认领"/> -->
@@ -707,8 +718,8 @@
                         <a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
                         <a:textField style="display:none"/>
                         <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"/>
-                        <a:comboBox name="write_off_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"/>
+                        <a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" 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"/>
                     </a:fieldSet>
 
@@ -732,8 +743,8 @@
                         <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" align="center"/>
+                        <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">
                         <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/>
                         <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/>
@@ -745,8 +756,8 @@
                             <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center"/>
                         </a:column>
                         <a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY" align="center"/>
-                        <a:column name="debt_confirmed_by_desc" prompt="CSH510.CSH_TRANSACTION.DEPT_CONFIRMER" align="center"/>
-                        <a:column name="acc_confirmed_by_desc" prompt="CSH510.CSH_TRANSACTION.ACCT_CONFIRMER" align="center"/>
+<!--                        <a:column name="debt_confirmed_by_desc" prompt="CSH510.CSH_TRANSACTION.DEPT_CONFIRMER" align="center"/>-->
+                        <a:column name="acc_confirmed_by_desc" prompt="确认人" align="center"/>
                     </a:columns>
                 <a:editors>
                     <a:numberField id="number_editor" allowDecimals="true" decimalPrecision="2" editable="false"/>

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

@@ -453,7 +453,7 @@
                     </a:field>
                     <a:field name="bp_bank_account_num"/>
                     <a:field name="bp_bank_account_name" required="true"/>
-                    <a:field name="collection_classes_desc" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
+                    <a:field name="collection_classes_desc" required="true" prompt="CSH510.CSH_TRANSACTION.PURPOSE_OF_FUNDS" options="ds_collection_classes_ds" 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"/>
                 </a:fields>
                 <a:events>
@@ -517,7 +517,7 @@
                     <a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" required="true"/>
                     <a:comboBox name="paid_byother_flag_n" prompt="代付" bindTarget="csh_transaction_receipt_head_ds" required="true"/>
                     <a:lov name="bp_name" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER"/>
-                    <a:comboBox name="collection_classes_desc" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH511.CSH_TRANSACTION.CLASS_DESC"/>
+                    <a:comboBox name="collection_classes_desc" bindTarget="csh_transaction_receipt_head_ds" prompt="CSH510.CSH_TRANSACTION.PURPOSE_OF_FUNDS"/>
                 </a:box>
                 <a:hBox style="width:800px">
                     <a:textField width="350" name="description" bindTarget="csh_transaction_receipt_head_ds"/>

src/main/webapp/modules/hls/HLS530/manual_journal_create.lview

@@ -163,9 +163,9 @@
                 var manual_flag = '${/parameter/@manual_flag}';
                 if (manual_flag == 'Y') {
                     record.set('je_company_id', 1);
-                    record.set('je_company_id_n', '智慧租赁')
+                    record.set('je_company_id_n', '宏菱融资租赁（上海）有限公司');
                     record.set('je_transaction_code', 'MANUAL');
-                    record.set('je_transaction_code_n', '手工生成')
+                    record.set('je_transaction_code_n', '手工生成');
                     record.set('post_gl_status', 'N');
                     record.set('currency_code', 'CNY');
                     record.set('currency_code_n', '人民币')