Merge branch 'feature/销项发票反冲描述' into develop

src/main/webapp/WEB-INF/classes/acr/ACR610/acr_invoice_apply_query.lwm

@@ -100,6 +100,7 @@
                 begin
                     acr_invoice_wfl_pkg.update_reverse_method(p_invoice_apply_id    => ${@invoice_apply_id},
                                                               p_reverse_method    => ${@reverse_method},
+                                                              p_note               => ${@note},
                                                               p_user_id             => ${/session/@user_id});
                 end;
                 ]]></bm:update-sql>

src/main/webapp/modules/acr/ACR514/acr_invoice_reverse_apply_temp_detail.lview

@@ -41,7 +41,8 @@
                     url: $('acr620_invoice_reverse_save_link').getUrl(),
                     para: {
                         invoice_apply_id: invoice_apply_id,
-                        reverse_method: record.get('reverse_method')
+                        reverse_method: record.get('reverse_method'),
+                        note: record.get('note')
                     },
                     success: function () {
                         Leaf.SideBar.show({
@@ -167,6 +168,7 @@
             datas['invoice_hd_ids'] = invoice_hd_ids;
             datas['apply_mode'] = 'REVERSE';
             datas['details'] = saveData;
+            datas['note'] = head_record.get('note');
             if (head_ds.validate()) {
                 if (head_record.get('reverse_method') == 'REVERSE') {
                     var all_record = $('acr514_invoice_reverse_detail_result_ds').getAll();
@@ -278,6 +280,7 @@
                     <a:field name="reverse_method_n" displayField="code_value_name" options="acr514_reverse_method_ds"
                              returnField="reverse_method" valueField="code_value" required="true"
                              requiredMessage="请输入必输字段：反冲方式"/>
+                    <a:field name="note" required="true" requiredMessage="请输入必输字段：反冲意见"/>
                 </a:fields>
             </a:dataSet>
             <a:dataSet id="acr514_invoice_reverse_detail_result_ds" autoPageSize="true" autoQuery="true" fetchAll="true"
@@ -310,6 +313,9 @@
                     <a:comboBox name="reverse_method_n" bindTarget="acr514_invoice_reverse_apply_basic_ds" prompt="反冲方式"
                                 width="135"/>
                 </a:hBox>
+                <a:hBox row="2" labelSeparator=" ">
+                    <a:textArea name="note" bindTarget="acr514_invoice_reverse_apply_basic_ds" prompt="反冲意见" height="60" width="565"/>
+                </a:hBox>
             </a:form>
             <a:grid id="acr514_invoice_reverse_detail_grid_ds" bindTarget="acr514_invoice_reverse_detail_result_ds"
                     marginHeight="130"

src/main/webapp/modules/acr/ACR620/acr_invoice_reverse_apply_detail.lview

@@ -33,7 +33,8 @@
                     url: $('acr620_invoice_reverse_save_link').getUrl(),
                     para: {
                         invoice_apply_id: '${/parameter/@invoice_apply_id}',
-                        reverse_method: record.get('reverse_method')
+                        reverse_method: record.get('reverse_method'),
+                        note: record.get('note')
                     },
                     success: function () {
                         Leaf.SideBar.show({
@@ -138,6 +139,7 @@
                     <a:field name="invoice_apply_date"/>
                     <a:field name="reverse_method_n" displayField="code_value_name" options="acr620_reverse_method_ds"
                              returnField="reverse_method" valueField="code_value" required="true" requiredMessage="请输入必输字段：反冲方式"/>
+                    <a:field name="note" required="true" requiredMessage="请输入必输字段：反冲意见"/>
                 </a:fields>
                 <a:events>
                     <a:event name="load" handler="acr620_invoice_reverse_load"/>
@@ -161,6 +163,9 @@
                     <a:textField name="invoice_apply_date" bindTarget="acr620_invoice_reverse_apply_basic_ds" prompt="申请时间" width="135" readOnly="true"/>
                     <a:comboBox name="reverse_method_n" bindTarget="acr620_invoice_reverse_apply_basic_ds" prompt="反冲方式" width="135"/>
                 </a:hBox>
+                <a:hBox row="2" labelSeparator=" ">
+                    <a:textArea name="note" bindTarget="acr620_invoice_reverse_apply_basic_ds" prompt="反冲意见" height="60" width="565"/>
+                </a:hBox>
             </a:form>
             <a:grid id="acr620_invoice_reverse_detail_grid_ds" bindTarget="acr620_invoice_reverse_detail_result_ds" marginHeight="135"
                     marginWidth="30" navBar="true">

src/main/webapp/modules/acr/ACR620/acr_invoice_reverse_apply_detail_wfl.lview

@@ -101,6 +101,7 @@
                     <a:field name="invoice_apply_user_n"/>
                     <a:field name="invoice_apply_date"/>
                     <a:field name="reverse_method_n"/>
+                    <a:field name="note"/>
                 </a:fields>
             </a:dataSet>
             <a:dataSet id="acr620_invoice_reverse_detail_result_ds" autoPageSize="true" autoQuery="true" fetchAll="true"
@@ -133,6 +134,9 @@
                     <a:textField name="invoice_apply_date" bindTarget="acr620_invoice_reverse_apply_basic_ds" prompt="申请时间" width="135" readOnly="true"/>
                     <a:comboBox name="reverse_method_n" bindTarget="acr620_invoice_reverse_apply_basic_ds" prompt="反冲方式" width="135" readOnly="true"/>
                 </a:hBox>
+                <a:hBox row="2" labelSeparator=" ">
+                    <a:textArea name="note" bindTarget="acr620_invoice_reverse_apply_basic_ds" prompt="反冲意见" height="60" width="565" readOnly="true"/>
+                </a:hBox>
             </a:form>
             <a:switch test="/parameter/@button_flag">
                 <a:case value="YES">