#

atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json

@@ -1183,6 +1183,8 @@
     "QMYETotalFirst" : "期末余额合计(借-贷)",
     "QMYETotalend" : "期末余额合计(贷-借)",
     "Backfill any adjusted total value back to the adjusted amount" : "单选任意合计值回填至调整后金额",
-    "BackAdjustAmount" : "调整后金额"
+    "BackAdjustAmount" : "调整后金额",
+    "OperateDate" : "操作日期"
+
 
   }
\ No newline at end of file

atms-web/src/main/webapp/app/cit/report/entryList-modal/entryList-modal.ctrl.js

@@ -47,6 +47,8 @@
 
                  $log.debug($scope.selectedItems);*/
                 $scope.doCalcute(selectedItems.selectedRowsData);
+                //更新日志
+                $scope.relObj
 
             },
             allowColumnResizing: true,
@@ -118,6 +120,7 @@
 
         $scope.hideCellAttachmentModel = function () {
             $('#entryListModal').modal('hide');
+            entityInit();
         }
 
         //
@@ -135,6 +138,7 @@
                     v1 += v1 + parseFloat(item.accountedDr);
                     v2 += v2 + parseFloat(item.accountedCr);
                 }
+                _index++;
             });
             $scope.entry.JFFSETotal = v1;
             $scope.entry.DFFSETotal = v2;

atms-web/src/main/webapp/app/cit/report/entryLog-modal/entryLog-modal.ctrl.js

+citModule.controller('entryLogModalController', ['$log', 'apiInterceptor', 'Upload', '$scope', '$q', '$translate', '$uibModal', '$document', '$rootScope', 'SweetAlert', 'enums',
+    'vatReportService', 'loginContext', 'vatSessionService', 'stdAccountService', 'vatCommonService', 'formulaService', 'KeyValueConfigService', 'modelConfigurationService', '$timeout', 'cellCommentService', 'modifiedReportCellService',
+    function ($log, apiInterceptor, Upload, $scope, $q, $translate, $uibModal, $document, $rootScope, SweetAlert, enums, vatReportService, loginContext,
+              vatSessionService, stdAccountService, vatCommonService, formulaService, KeyValueConfigService, modelConfigurationService, $timeout, cellCommentService, modifiedReportCellService) {
+
+        $scope.dataGridOptions = {
+            bindingOptions: {
+                columns: 'entryLogColumns',
+                dataSource: 'relObj.entryLogSource'
+            },
+            loadPanel: {
+                enabled: false
+            },
+            scrolling: {
+                mode: "standard"
+            },
+            selection: {
+                mode: "multiple"
+            },
+            sorting: {
+                mode: 'single'
+            },
+            filterRow: {
+                visible: true
+            },
+            searchPanel: {
+                visible: true,
+                width: 240,
+                placeholder: $translate.instant('SearchPlaceholder')
+            },
+            allowColumnResizing: true,
+            hoverStateEnabled: true,
+            showBorders: true,
+            showRowLines: true,
+            showColumnLines: true,
+        };
+
+
+        //设置数据源表格的列
+        var getEntryLogColumns = function () {
+            var dataGridColumns;
+            dataGridColumns = [
+                {
+                    dataField: 'index',
+                    caption: $translate.instant('ImportErrorPopUpNoCol'),
+                    alignment: 'center'
+                },
+                {
+                    dataField: 'accountingDate',
+                    caption: $translate.instant('OperateDate'),
+                    alignment: 'left',
+                    dataType: 'date',
+                    customizeText: function (cellInfo) {
+                        if (cellInfo && cellInfo.value) {
+                            return new Date(cellInfo.value).dateTimeToString('yyyyMMdd');
+                        }
+                        return "";
+                    }
+                },
+                {
+                    dataField: 'voucherNum',
+                    caption: $translate.instant('VoucherCode'),
+                    alignment: 'center'
+                },
+                {
+                    dataField: 'description',
+                    caption: $translate.instant('Operate'),
+                    alignment: 'center'
+                }
+            ];
+            return dataGridColumns;
+        };
+
+        $scope.entryLogColumns = getEntryLogColumns();
+
+
+        $scope.hideCellAttachmentModel = function () {
+            $('#entryListModal').modal('hide');
+        }
+
+
+    }
+]);
\ No newline at end of file

atms-web/src/main/webapp/app/cit/report/entryLog-modal/entryLog-modal.html

+<div class="modal fade" id="entryListModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog modal-lg" style="width: 1200px;">
+        <div class="modal-content">
+            <div class="modal-header">
+                <span class="close" data-dismiss="modal" aria-hidden="true"
+                      ng-click="hideCellAttachmentModel()">×</span>
+                <h4 class="modal-title" translate="Remarks"></h4>
+            </div>
+            <div class="dx-viewport">
+                <div id="dataSourceGrid" dx-data-grid="dataGridOptions"></div>
+            </div>
+        </div>
+    </div>
+</div>
+</div>
\ No newline at end of file

atms-web/src/main/webapp/app/cit/report/entryLog-modal/entryLog-modal.js

+citModule.directive('entryModal', ['$log',
+function ($log) {
+    return {
+        restrict: 'E',
+        templateUrl: '/app/cit/report/entryLog-modal/entryLog-modal.html' + '?_=' + Math.random(),
+        scope: {
+            relObj : '='
+        },
+        controller: 'entryLogModalController',
+        link: function ($scope, $element, $attr) {
+        }
+    }
+}]);
\ No newline at end of file

atms-web/src/main/webapp/app/cit/report/entryLog-modal/entryLog-modal.less

+@small-panel-height: 40px;
+@small-panel-margin: 10px;
+@small-panel-border-color: #E4E4E4;
+@tab-not-selected: #bababa;
+@focus: #c00;
+@btn-color: white;
+@btn-not-focus: #777;
+
+#entryListModal{
+    .backColor{
+        background-color: #a09595b3;
+    }
+    .backColor{
+        h4 {
+            display: inline-block;
+    }
+    }
+}
\ No newline at end of file

atms-web/src/main/webapp/app/cit/report/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js

@@ -690,6 +690,12 @@
                 }, 0);
                 $("#dataGridFooterSummary").html($translate.instant('Conclusion')
                     + '    ' + evalVal.formatAmount(precition));
+            }else if($scope.selectedTabIndex === enums.formulaDataSourceType.CIT_TBAM){
+                evalVal = _.reduce($scope.detail.dataGridSource, function (memo, x) {
+                    return memo + x.endBalance;
+                }, 0);
+                $("#dataGridFooterSummary").html($translate.instant('Conclusion')
+                    + '    ' + evalVal.formatAmount(precition));
             }
             else { // For 报表数据源 and BSPL数据源
                 if ($scope.detail.dataGridSource && $scope.detail.dataGridSource.length > 0) {
@@ -717,7 +723,6 @@
 
         //设置数据源表格的列
         var getDataGridColumns = function () {
-            debugger;
             var dataGridColumns;
             switch ($scope.detail.cellType) {
                 case enums.formulaDataSourceType.TrialBalanceSource:
@@ -1514,7 +1519,7 @@
             }
             return dataGridColumns;
         };
-
+//-----------------------------------------------------kevin insert ----------------------------------------------------------------
         //监听穿透返回值（调整后金额）
         $scope.$watch('relObj.checkRadio', function (n, o) {
             if($scope.detail.entryIndex != undefined){
@@ -1697,6 +1702,8 @@
             return dataGridColumns;
         };
 
+
+//-------------------------------------------------------------------- end --------------------------------------------------------------
         //添加数据源（发票|凭证）数据过滤
         var allDataFilter = function (config, data) {
             var dataGridColumns;
@@ -1763,7 +1770,6 @@
             });
             addDataSource();
         }
-
         //计算凭证的数值
         function calculateVoucherValue(voucher) {
             return voucher.direction * ((voucher.debitAmount ? voucher.debitAmount : 0) - (voucher.creditAmount ? voucher.creditAmount : 0));

atms-web/src/main/webapp/app/cit/report/tax-report-cell-detail-modal/tax-report-cell-detail-modal.html

@@ -303,6 +303,8 @@
 
     <!--分录弹框-->
     <entry-list-modal id ="entryListId" rel-obj = "relObj" ></entry-list-modal>
+    <entry-Log id ="entryLogId" rel-obj = "relObj" ></entry-Log>
+
 </div>
 
 <div class="tax-report-cell-detail" id="addSourceContainer"></div>