#

atms-api/src/main/java/pwc/taxtech/atms/dto/previewData/CitSalaryDataDto.java

+package pwc.taxtech.atms.dto.previewData;
+
+import com.github.pagehelper.PageInfo;
+import pwc.taxtech.atms.dto.input.CamelPagingDto;
+import pwc.taxtech.atms.entity.CitSalaryAdvance;
+
+public class CitSalaryDataDto extends CitSalaryAdvance {
+    private CamelPagingDto pageInfo;
+
+    public CamelPagingDto getPageInfo() {
+        return this.pageInfo;
+    }
+
+    public void setPageInfo(CamelPagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+}

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/DataValidateLogMapper.java

+package pwc.taxtech.atms.vat.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyVatMapper;
+import pwc.taxtech.atms.vat.entity.DataValidateLog;
+import pwc.taxtech.atms.vat.entity.DataValidateLogExample;
+
+@Mapper
+public interface DataValidateLogMapper extends MyVatMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    long countByExample(DataValidateLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(DataValidateLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int insert(DataValidateLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int insertSelective(DataValidateLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    List<DataValidateLog> selectByExampleWithRowbounds(DataValidateLogExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    List<DataValidateLog> selectByExample(DataValidateLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    DataValidateLog selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") DataValidateLog record, @Param("example") DataValidateLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") DataValidateLog record, @Param("example") DataValidateLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(DataValidateLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table data_validate_log
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(DataValidateLog record);
+}
\ No newline at end of file

atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.ctrl.js

+citModule.controller('citPreviewSalaryAdvanceController', ['$scope', '$log', '$translate', '$timeout', '$compile', '$uibModal', 'apiInterceptor',
+     'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatSessionService', 'citSessionService', 'vatImportService', 'loginContext',
+    'browserService', 'enums', 'vatOperationLogService', 'citPreviewDataService', 'vatCommonService', 'ackMessageBox','commonWebService',
+    function ($scope, $log, $translate, $timeout, $compile, $uibModal, apiInterceptor, SweetAlert, $q, uiGridConstants,
+              $interval, vatSessionService, citSessionService, vatImportService, loginContext, browserService, enums, vatOperationLogService, citPreviewDataService,
+              vatCommonService, ackMessageBox, commonWebService) {
+        'use strict';
+        $scope.listData = [];
+
+ /*       $scope.formOptions = {
+            formData: salaryData,
+            colCount: 2,
+            items: [{
+                dataField: "FirstName",
+                editorOptions: {
+                    value: ""
+                }
+            },
+                {
+                    itemType: "button",
+                    horizontalAlignment: "left",
+                    buttonOptions: {
+                        text: "查询",
+                        type: "success",
+                        useSubmitBehavior: true
+                    }
+                }]
+        };*/
+
+       /* $scope.onFormSubmit = function(e) {//执行查询
+
+            e.preventDefault();
+        };*/
+
+        //初始化dx控件
+        function initAssetResultDxGrid() {
+            var dupColumns = [
+                { caption: $translate.instant('ImportErrorPopUpNoCol'), dataField: "index", width: 50, allowEditing: false, fixed: true },
+                { caption: $translate.instant('poSubjectName'), dataField: "poSubjectName", width: 200, allowEditing: false, fixed: true },
+                /*  { caption: $translate.instant('organizationId'), dataField: "organizationId", width: 120, allowEditing: false, fixed: true },
+                  { caption: $translate.instant('ProjectNameCol'), dataField: "projectName", width: 120, allowEditing: false, fixed: true },*/
+                { caption: $translate.instant('period'), dataField: "period", width: 200, allowEditing: false, fixed: true },
+                { caption: $translate.instant('source'), dataField: "source", width: 200, allowEditing: false, fixed: true },
+                { caption: $translate.instant('advancePrice'), dataField: "advance", width: 200, allowEditing: false, fixed: true },
+                { caption: $translate.instant('approvedPrice'), dataField: "approvedStandardInvoiceAmount", width: 200, allowEditing: false, fixed: true },
+                /*   { caption: $translate.instant('createBy'), dataField: "createdBy", width: 200, allowEditing: false, fixed: true },*/
+                { caption: $translate.instant('createTime'), dataField: "createTime", width: 200, allowEditing: false, fixed: true }
+            ];
+
+            $scope.assetsResultGridOptions = {
+                columns: dupColumns,
+                bindingOptions: {
+                    "dataSource": "listData",
+                },
+                editing: {
+                    mode: "batch",
+                    allowUpdating:true,
+                },
+                onInitialized: function (e) {
+                    $scope.dataGridInstance = e.component;
+                },
+                onCellPrepared: function (e) {
+
+                },
+                loadPanel: {
+                    enabled: true
+                },
+                paging: {
+                    pageSize: 100,
+                },
+                searchPanel: {
+                    visible: true,
+                    width: 240,
+                    placeholder: $translate.instant('SearchPlaceholder')
+                },
+                showBorders: true,
+                hoverStateEnabled: true,
+                //scrolling: { mode: "virtual" },
+                noDataText: $translate.instant('AccountVoucher_DataGrid_NoDataText'),
+                height: '99%',
+                width: '98%',
+                filterRow: {
+                    visible: true
+                },
+                onRowUpdating: function (e) {
+
+                },
+                onToolbarPreparing: function (e) {
+
+                }
+            }
+        }
+
+        var initListData = function(){
+            citPreviewDataService.getCitPreviewSalaryAdvanceDataList($scope).success(function (res) {
+
+                $scope.listData = commonWebService._index(res.list);
+                $scope.pagingOptions.totalItems = res.pageInfo.totalCount;
+                //$scope.$apply();
+            }).error(function (error) {
+                swal({
+                    title: "信息",
+                    text: error,
+                    type: "info"
+                });
+            });
+
+        }
+
+        //刷新页面
+        $scope.refreshConfigGrid = function () {
+            citPreviewDataService.getCitPreviewSalaryAdvanceDataList($scope)
+                .success(function (res) {
+                    if (res && res.list) {
+                        $scope.listData =commonWebService._index(res.list);
+                        $scope.pagingOptions.totalItems = res.pageInfo.totalCount;
+                    }else {
+                        SweetAlert.error($translate.instant('SystemError'));
+                    }
+                })
+        };
+
+
+        //开始
+        (function initialize() {
+
+            //分页的设置
+            $scope.pagingOptions = {
+                pageIndex: 1,  //当前页码
+                totalItems: 0,  //总数据
+                pageSize: 20,  //每页多少条数据
+            };
+            $scope.formParam = {};
+            initAssetResultDxGrid();
+            initListData();
+        })();
+    }
+]);
\ No newline at end of file

atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.html

+<div class="cit-import-asset-list">
+    <div class="nav-wrapper">
+        <div class="nav-header">{{'citSalaryAdvance' | translate}}</div>
+    </div>
+ <!--   <div class="widget-container">
+        <div>查询条件:</div>
+        <div id="form" dx-form="formOptions"></div>
+    </div>-->
+
+    <div class="dx-viewport grid-container">
+
+    <div id="gridContainer" dx-data-grid="assetsResultGridOptions"></div>
+    <div class="page-footer">
+        <ack-pagination page-options="pagingOptions"
+                        refresh-table="refreshConfigGrid()"></ack-pagination>
+    </div>
+    </div>
+  <!--  <div class="error-list-modal">
+        <div class="modal fade" id="errorListModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+             data-backdrop="static" data-keyboard="false">
+            <div class="modal-dialog" style="width: 720px; height: 200px;" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <div class="modal-title">
+                            {{'ImportErrorPopUpTitle' | translate}}
+                        </div>
+                    </div>
+                    <div class="modal-body">
+                        {{'ImportErrorPopUpErrorDetail' | translate}}：
+                        <br/>
+                        <table>
+                            <thead>
+                            <tr>
+                                <th width="10%" style="text-align:center;">{{'ImportErrorPopUpNoCol' | translate}}</th>
+                                <th width="20%">{{'ImportErrorPopUpErrorTypeCol' | translate}}</th>
+                                <th width="10%" style="text-align:center;">{{'ImportErrorPopUpErrorCountCol' |
+                                    translate}}
+                                </th>
+                                <th width="60%">{{'ImportErrorPopUpErrorDescCol' | translate}}</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr ng-repeat="error in errorMsgMap track by $index">
+                                <td width="10%" style="text-align:center;">{{$index + 1}}</td>
+                                <td width="20%">{{error.errorType}}</td>
+                                <td width="10%" style="text-align:center;">{{error.errorCount}}</td>
+                                <td width="60%" ng-bind-html="error.errorContent"></td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-primary" translate="Confirm" data-dismiss="modal"></button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>-->
+
+    <!--资产分类设置界面-->
+    <!--<script type="text/ng-template" id="set-asset-group-modal.html">
+        <div class="modal-content">
+            <div class="modal-header">
+                <div class="modal-title">
+                    {{'SetAssetGroup' | translate}}
+                </div>
+            </div>
+            <div class="modal-body">
+                <div class="grid-container">
+                    <div id="assetsGroupGrid" dx-data-grid="assetsGridOptions"
+                         style="max-width: 760px; margin-top: -40px;">
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button style="margin-left: 22px;" type="button" class="btn btn-primary" ng-click="saveAssetGroupInfo()"
+                        ng-disabled="!hasEditPermission">{{'Confirm' | translate }}
+                </button>
+                <button type="button" class="btn btn-third" ng-click="cancelAsset()" ng-if="!isDisabled"
+                        ng-disabled="isDisabled">{{'ButtonCancel' | translate }}
+                </button>
+            </div>
+        </div>
+    </script>-->
+
+    <vat-operate-log period="period" module-type="moduleid" is-show="isShowLog"></vat-operate-log>
+</div>
\ No newline at end of file

atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.js

+citModule.directive('citPreviewSalaryAdvanceList', ['$log', '$translate',
+    function ($log, $translate) {
+        'use strict';
+        $log.debug('citPreviewSalaryAdvanceList.load...');
+
+        return {
+            restrict: 'E',
+            templateUrl: '/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.html' + '?_=' + Math.random(),
+            scope: {},
+            controller: 'citPreviewSalaryAdvanceController',
+            link: function (scope, element) { 
+            }
+        };
+    }
+]);
\ No newline at end of file

atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.less

+@import "~/app-resources/less/theme.less";
+
+.cit-import-asset-list {
+    padding-left: 20px;
+    height: 96%;
+
+    .sweet-alert {
+        background-color: #eeeeee;
+    }
+
+    .nav-wrapper {
+        padding-bottom: 10px;
+        border-bottom: 1px solid #DBD8D3;
+
+        .nav-header {
+            height: 54px;
+            line-height: 54px;
+            font-family: "Microsoft YaHei Bold", "Microsoft YaHei Regular", "Microsoft YaHei";
+            font-weight: 700;
+            font-style: normal;
+            font-size: 15px;
+            color: #333;
+        }
+
+        .nav-tab {
+            /*display: inline-block;*/
+            span {
+                display: inline-block;
+                height: 34px;
+                width: 80px;
+                text-align: center;
+                line-height: 34px;
+                padding: 0 10px;
+                background-color: #B90808;
+                color: #FFF;
+                font-family: "Microsoft YaHei";
+                font-weight: 400;
+                font-style: normal;
+                font-size: 14px;
+                cursor: pointer;
+            }
+
+            .active {
+                background-color: #F91000;
+            }
+        }
+    }
+
+    .alert-warning {
+        background-color: #FDE2DE;
+        cursor: pointer;
+    }
+
+    .alert {
+        color: #CF2D1B;
+        font-weight: bold;
+        display: inline-block;
+        padding: 5px;
+        float: left;
+        margin: -45px 0 0 350px;
+
+        i {
+            font-size: 20px;
+            vertical-align: middle;
+            margin-right: 5px;
+        }
+    }
+
+    .dropdown-common() {
+        display: inline-block;
+
+        .select-button {
+            background-color: #F5F5F5;
+            padding: 6px 0;
+            width: 110px;
+        }
+
+        .caret {
+            margin-top: 8px;
+        }
+
+        .dropdown-menu {
+            min-width: 140px;
+            max-height: 400px;
+            overflow-y: scroll;
+
+            li {
+                text-align: left;
+                min-height: 0px;
+                height: 30px;
+                color: #000;
+                font-weight: normal;
+
+                &:hover {
+                    background-color: #F91000;
+                    color: #FFF;
+                    cursor: pointer;
+                }
+
+                i {
+                    float: right;
+                    font-size: 15px;
+                }
+            }
+        }
+    }
+
+    #tab_total {
+        display: block;
+        height: calc(~'100% - 80px');
+        position: relative;
+
+        .operation-wrapper {
+            margin: -40px 15px 0 0;
+
+            span {
+                cursor: pointer;
+            }
+        }
+
+        .import-wrapper {
+            margin-top: 10px;
+
+            span {
+                margin-left: 10px;
+                color: #333;
+                font-family: "Microsoft YaHei";
+                font-style: normal;
+                font-size: 14px;
+                font-weight: bold;
+            }
+
+            .dropdown {
+                .dropdown-common();
+            }
+
+            input {
+                width: 50px;
+                outline: none;
+                border-radius: 3px;
+                border: 1px solid #3c3a36;
+                padding: 2px;
+                text-align: center;
+            }
+
+            > button:last-child {
+                float: right;
+                margin-right: 20px;
+            }
+
+            .btn-wrapper {
+                border-radius: 5px;
+                background-color: #e0301e;
+                color: #FFF;
+                display: inline-block;
+                float: right;
+                margin-right: 10px;
+
+                .btn-vat-primary {
+                    min-width: 80px;
+                }
+            }
+
+            .import-info-wrapper {
+                display: inline-block;
+            }
+        }
+
+        .dt-init-wrapper {
+            margin: 10px 0;
+            max-width: 99%;
+            height: calc(~'100% - 80px');
+            position: relative;
+            z-index: 1;
+
+            .dropdown {
+                .dropdown-common();
+
+                i {
+                    color: #F85550;
+                }
+            }
+
+            .total-Wrapper {
+                width: 99%;
+                margin-left: 0px;
+                font-size: 13px;
+                font-family: 'Microsoft YaHei';
+                padding-bottom: 5px;
+
+                .total_span {
+                    color: #B4122A !important;
+                    background-color: #ddd !important;
+                    font-size: 12px !important;
+                    font-weight: bold !important;
+                    border-radius: 10px !important;
+                    padding-left: 8px !important;
+                    padding-right: 8px !important;
+                }
+            }
+            /*.balance-ouput-grid-wrapper {
+                height: calc(~'100% - -10px');
+                overflow: hidden;
+                position: absolute;
+                top: 0;
+                bottom: 150px;
+                left: 0;
+                right: 0;
+                background-color: #FFF;
+            }*/
+        }
+
+        .dt-import-wrapper {
+            margin: 10px 0;
+            max-width: 99%;
+            overflow: auto;
+            height: calc(~"100% - 70px");
+
+            .dropdown {
+                .dropdown-common();
+
+                i {
+                    color: #F85550;
+                }
+
+                button {
+                    color: #333;
+                }
+            }
+        }
+
+        .error-info-wrapper {
+            position: absolute;
+            height: 150px;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            overflow: hidden;
+            background-color: #FFF;
+            margin-left: -39px;
+            z-index: 2;
+        }
+
+        #content-resizer {
+            width: 110%;
+            position: absolute;
+            height: 4px;
+            bottom: 150px;
+            left: 0;
+            right: 0;
+            background-color: red;
+            cursor: n-resize;
+            margin-left: -39px;
+
+            #topIcon {
+                cursor: pointer;
+                margin-top: -19px;
+                width: 38px;
+                margin-left: 46%;
+                z-index: 999;
+                bottom: -200px;
+                text-align: center;
+                display: block !important;
+            }
+        }
+    }
+
+    #tab_Assets {
+        display: block;
+        height: calc(~'100% - 80px');
+        position: relative;
+
+        .total-Wrapper {
+            width: 72%;
+            margin-left: 0px;
+            font-size: 13px;
+            font-family: 'Microsoft YaHei';
+            padding-top: 5px;
+            position: absolute;
+            z-index: 9;
+
+            .total_span {
+                color: #B4122A !important;
+                background-color: #ddd !important;
+                font-size: 12px !important;
+                font-weight: bold !important;
+                border-radius: 10px !important;
+                padding-left: 8px !important;
+                padding-right: 8px !important;
+            }
+        }
+
+        .dt-asset-result {
+            margin: 0px 0;
+            max-width: 99%;
+            height: calc(~'100% - 20px');
+            position: relative;
+            margin-top: 10px;
+
+            .herder-center {
+                text-align: center !important;
+                vertical-align: middle !important;
+                /*font-size:13px !important;*/
+            }
+        }
+    }
+
+    .error-list-modal {
+        .modal-title {
+            color: #FF0000;
+        }
+
+        .modal-body {
+            max-height: 300px;
+            overflow-y: auto;
+
+            table {
+                border: 1px solid #CCC;
+
+                thead tr th {
+                    height: 30px;
+                    border: 1px solid #CCC;
+                }
+
+                tbody tr td {
+                    height: 25px;
+                    border: 1px solid #CCC;
+                }
+            }
+        }
+
+        .modal-footer {
+            text-align: center;
+        }
+    }
+
+    .page-form-group {
+        float: right;
+        margin-top: 10px;
+
+        .page-size {
+            margin: 0;
+        }
+
+        .pagination {
+            margin: 0;
+        }
+    }
+
+    #gridInitData {
+        border-radius: 3px;
+        border: 1px solid #d4d4d4;
+    }     
+}
+
+
+.set-asset-list-modal .modal-dialog {
+    height: 500px;
+    width: 800px;
+
+    .modal-content {
+        height: 100%;
+        width: 100%;
+    }
+
+    .modal-title {
+        color: #333;
+        font-size: 16px;
+        font-weight: bold;
+    }
+
+    .modal-body {
+        height: 76%;
+        max-width: 760px !important;
+        margin-left: 22px; 
+        overflow-y: auto;
+
+        .herder-center {
+            text-align: center !important;
+        }
+
+        .column-color {
+            color: red !important;
+        }
+    }
+
+    .modal-footer {
+        text-align:left;
+
+    }
+}