Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-api/src/main/java/pwc/taxtech/atms/controller/ApprovalController.java

@@ -37,7 +37,7 @@ public class ApprovalController {
     @ResponseBody
     @RequestMapping(value = "/deploy", method = RequestMethod.POST)
     public ResponseEntity deploy() {
-        repositoryService.createDeployment().addClasspathResource("bpmn/approval.bpmn").deploy();
+        repositoryService.createDeployment().addClasspathResource("bpmn/approval1.bpmn").deploy();
         return ResponseEntity.ok().build();
     }
 

atms-web/src/main/java/pwc/taxtech/atms/common/DDUserInfo.java

+package pwc.taxtech.atms.common;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 05/03/2019 18:25
+ * @Description:
+ */
+public class DDUserInfo {
+
+    private int uid;
+
+    private String phone;
+
+    @JSONField(name = "username_zh")
+    private String username_zh;
+
+    private String email;
+
+    private String username;
+
+    public int getUid() {
+        return uid;
+    }
+
+    public void setUid(int uid) {
+        this.uid = uid;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getUsername_zh() {
+        return username_zh;
+    }
+
+    public void setUsername_zh(String username_zh) {
+        this.username_zh = username_zh;
+    }
+}

atms-web/src/main/java/pwc/taxtech/atms/common/DDUserInfoRes.java

+package pwc.taxtech.atms.common;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 05/03/2019 18:25
+ * @Description:
+ */
+public class DDUserInfoRes {
+
+    private int errno;
+
+    @JSONField(name = "data")
+    private DDUserInfo ddUserInfo;
+
+    private String errmsg;
+
+    public int getErrno() {
+        return errno;
+    }
+
+    public void setErrno(int errno) {
+        this.errno = errno;
+    }
+
+    public DDUserInfo getDdUserInfo() {
+        return ddUserInfo;
+    }
+
+    public void setDdUserInfo(DDUserInfo ddUserInfo) {
+        this.ddUserInfo = ddUserInfo;
+    }
+
+    public String getErrmsg() {
+        return errmsg;
+    }
+
+    public void setErrmsg(String errmsg) {
+        this.errmsg = errmsg;
+    }
+}

atms-web/src/main/java/pwc/taxtech/atms/web/controller/IndexController.java

@@ -130,7 +130,7 @@ public class IndexController {
           }catch (Exception e){
             logger.error("ddSSOCallback error",e);
         }
-        return "redirect:"+tempContextUrl+"Account/LogOn";
+        return "redirect:"+tempContextUrl;
     }
 
     @RequestMapping(value = {"/admin", "/admin.html"}, method = RequestMethod.GET)

atms-web/src/main/java/pwc/taxtech/atms/web/service/OrangeHeapService.java

 package pwc.taxtech.atms.web.service;
 
+import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpResponse;
@@ -8,11 +9,20 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+import pwc.taxtech.atms.common.DDUserInfoRes;
+import pwc.taxtech.atms.common.HttpUtil;
 import pwc.taxtech.atms.web.OrangeHeapConfig;
-
 import javax.annotation.Resource;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
 
 @Service
@@ -21,7 +31,23 @@ public class OrangeHeapService {
     @Resource
     private OrangeHeapConfig systemConfig;
 
-    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private static Logger logger = LoggerFactory.getLogger(OrangeHeapService.class);
+
+    @Autowired
+    HttpServletRequest request;
+
+    @Autowired
+    HttpServletResponse response;
+
+    @Value("${get_user_info_url}")
+    private String getUserInfoUrl;
+
+    @Value("${app_id}")
+    private String appId;
+
+    @Value("${app_key}")
+    private String appKey;
+
 
     public Optional<String> getTicket(String username) {
         CloseableHttpClient httpClient = null;
@@ -55,78 +81,159 @@ public class OrangeHeapService {
 
 
     public Optional<String> getTableauTaxCategoryUnreturnedTax() {
-        Optional<String> optional = Optional.of("admin");
+        Optional<String> optional = Optional.of(getDDUserName());
         return optional.map(s -> String.format(systemConfig.getTableauTaxCategoryUnreturnedTax(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
     public Optional<String> getTableauDistrictUnreturnedTax() {
-        Optional<String> optional = Optional.of("admin");
+        //TODO
+        Optional<String> optional = Optional.of(getDDUserName());
         return optional.map(s -> String.format(systemConfig.getTableauDistrictUnreturnedTax(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
     public Optional<String> getTableauUnreturnedAndReturnedTax() {
-        Optional<String> optional = Optional.of("admin");
+        Optional<String> optional = Optional.of(getDDUserName());
         return optional.map(s -> String.format(systemConfig.getTableauUnreturnedAndReturnedTax(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
     public Optional<String> getTableauCostAnalysis() {
-        Optional<String> optional = Optional.of("admin");
+        Optional<String> optional = Optional.of(getDDUserName());
         return optional.map(s -> String.format(systemConfig.getTableauCostAnalysis(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
     public Optional<String> getTableauDistrictProfitAndLoss() {
-        Optional<String> optional = Optional.of("admin");
+        Optional<String> optional = Optional.of(getDDUserName());
         return optional.map(s -> String.format(systemConfig.getTableauDistrictProfitAndLoss(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
     public Optional<String> getTableauCompanyProfitAndLoss() {
-        Optional<String> optional = Optional.of("admin");
+        Optional<String> optional = Optional.of(getDDUserName());
         return optional.map(s -> String.format(systemConfig.getTableauCompanyProfitAndLoss(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
     public Optional<String> getTableauDriverAndEmployee() {
-        Optional<String> optional = Optional.of("admin");
+        Optional<String> optional = Optional.of(getDDUserName());
         return optional.map(s -> String.format(systemConfig.getTableauDriverAndEmployee(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
     public Optional<String> getTableauGmvAndSubsidy() {
-        Optional<String> optional = Optional.of("admin");
+        Optional<String> optional = Optional.of(getDDUserName());
         return optional.map(s -> String.format(systemConfig.getTableauGmvAndSubsidy(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
     public Optional<String> getTableauFileArrangement() {
-        Optional<String> optional = Optional.of("admin");
+        Optional<String> optional = Optional.of(getDDUserName());
         return optional.map(s -> String.format(systemConfig.getTableauFileArrangement(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
     public Optional<String> getTableauGlobalOverview() {
-        Optional<String> optional = Optional.of("admin");
+        Optional<String> optional = Optional.of(getDDUserName());
         return optional.map(s -> String.format(systemConfig.getTableauGlobalOverview(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
     public Optional<String> getTableauGlobalBusiness() {
-        Optional<String> optional = Optional.of("admin");
+        Optional<String> optional = Optional.of(getDDUserName());
         return optional.map(s -> String.format(systemConfig.getTableauGlobalBusiness(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
     public Optional<String> getTableauMexicanTax() {
-        Optional<String> optional = Optional.of("admin");
+        Optional<String> optional = Optional.of(getDDUserName());
         return optional.map(s -> String.format(systemConfig.getTableauMexicanTax(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
     public Optional<String> getTableauAustralianTax() {
-        Optional<String> optional = Optional.of("admin");
+        Optional<String> optional = Optional.of(getDDUserName());
         return optional.map(s -> String.format(systemConfig.getTableauAustralianTax(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
     public Optional<String> getTableauBrazilianTax() {
-        Optional<String> optional = Optional.of("admin");
+        Optional<String> optional = Optional.of(getDDUserName());
         return optional.map(s -> String.format(systemConfig.getTableauBrazilianTax(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
     public Optional<String> getTableauOtherTaxAnalysis() {
-        Optional<String> optional = Optional.of("admin");
+        Optional<String> optional = Optional.of(getDDUserName());
         return optional.map(s -> String.format(systemConfig.getTableauOtherTaxAnalysis(), getTicket(s).orElse(StringUtils.EMPTY)));
     }
 
+
+    public String getDDUserName() {
+        logger.info("进入 获取DD user的方法~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
+        String ticket = getDDTicketByCookie();
+        logger.info("ticket=~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"+ticket);
+        return findUsernameByDDTicket(ticket);
+    }
+
+    //通過cookie 取出ddTicket
+    public String getDDTicketByCookie() {
+
+        Map<String,Cookie> cookieMap = ReadCookieMap();
+        //TODO  修改token的名字到配置文件,判断ddTicket是否过期
+        if(cookieMap.containsKey("ddTicket")){
+            return Optional.ofNullable(cookieMap.get("ddTicket")).map(s->s.getValue()).orElse("");
+        }else{
+            logger.info("code=~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"+Optional.ofNullable(cookieMap.get("code")).map(z->z.getValue()).orElse(""));
+            return getDDTicket(Optional.ofNullable(cookieMap.get("code")).map(z->z.getValue()).orElse(""));
+        }
+}
+
+    private String findUsernameByDDTicket(String ticket) {
+        Assert.hasText(ticket, "empty ticket");
+
+        DDUserInfoRes ddUserInfoRes = new DDUserInfoRes();
+        try {
+            String response = HttpUtil.post(getUserInfoUrl + "get_user_by_ticket", "ticket=" + ticket + "&app_id=" + appId, "application/x-www-form-urlencoded", "UTF-8", 10000, 10000);
+
+            logger.debug(String.format("DD-get_user_by_ticket返回:[%s]", response));
+            logger.info(String.format("DD-get_user_by_ticket返回:[%s]", response));
+            ddUserInfoRes = JSONObject.parseObject(response, DDUserInfoRes.class);
+        } catch (Exception e) {
+            logger.info(String.format("调用DDSSO获取用户信息失败:[%s]", e.getMessage()), e);
+            logger.error(String.format("调用DDSSO获取用户信息失败:[%s]", e.getMessage()), e);
+        }
+
+        String username = Optional.ofNullable(ddUserInfoRes)
+                .map(s -> s.getDdUserInfo())
+                .map(n -> n.getUsername())
+                .orElse("");
+        return username;
+    }
+
+    /**
+     * 将cookie封装到Map里面
+     * @return
+     */
+    private  Map<String,Cookie> ReadCookieMap(){
+        Map<String,Cookie> cookieMap = new HashMap<String,Cookie>();
+        Cookie[] cookies = request.getCookies();
+        if(null!=cookies){
+            for(Cookie cookie : cookies){
+                cookieMap.put(cookie.getName(), cookie);
+            }
+        }
+        return cookieMap;
+    }
+    //copy過來的 沒對象
+    public String getDDTicket(String code) {
+        logger.info("code=~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"+code);
+        try{
+            JSONObject object;
+            String ddResponse = HttpUtil.post(getUserInfoUrl + "check_code", "code=" + code + "&app_key=" + appKey+ "&app_id=" + appId, "application/x-www-form-urlencoded", "UTF-8", 10000, 10000);
+            object = JSONObject.parseObject(ddResponse);
+            Map<String, Object> res = object.getInnerMap();
+            int errno = (int) res.get("errno");
+            if (errno != 0) {
+                logger.warn(String.format("DDTicket get Failed:[%s]", object.toJSONString()));
+                return null;
+            }else{
+                Map<String, String> dataMap = (Map)res.get("data");
+                Cookie cookie=new Cookie("ddTicket",dataMap.get("ticket"));
+                response.addCookie(cookie);
+                return dataMap.get("ticket");
+            }
+        }catch (Exception e){
+            logger.error(String.format("通过code:[%s]获取Ticket失败",code));
+        }
+        return null;
+    }
 }

atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.ctrl.js

@@ -278,7 +278,8 @@
                 }
                 else {
                     $scope.confirmDocFileType = createDocFileType;
-                    $scope.editModel = {};
+                    //默认为选中
+                    $scope.editModel = {"status":1};
                 }
                 createMultiSelect();
                 $('#editPopDialog').modal('show');

atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.html

@@ -162,7 +162,7 @@
                                            || editModel.status == null
                                            || editModel.status == undefined
                                            || editModel.status == ''"
-                                           ng-model="editModel.status"/>
+                                           ng-model="editModel.status" />
                                     <span translate="Enable"></span>
                                 </label>
                                 <label class="col-sm-5 DM-state-label">

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js

@@ -133,6 +133,18 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
             if ($scope.componentSelectedArea) {
                 editModel.areaID = $scope.selectedAreaId;
             }
+
+            //所属业务线校验
+            if(!editModel.businessUnitID){
+                SweetAlert.error("请检查必填项");
+                return;
+            }
+            //区域校验
+            if (editModel.areaID === "") {
+                SweetAlert.error("请检查必填项");
+                return;
+            }
+
             if ($scope.isAdd) {
                 editModel.isActive = true;
                 orgService.addOrg(editModel).success(function (orgId) {
@@ -277,6 +289,17 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                 editModel.areaID = $scope.selectedAreaId;
             }
 
+            //所属业务线校验
+            if(!editModel.businessUnitID){
+                SweetAlert.error("请检查必填项");
+                return;
+            }
+            //区域校验
+            if (editModel.areaID === "") {
+                SweetAlert.error("请检查必填项");
+                return;
+            }
+
             if((typeof $scope.editOrgModel.foundationDate) ==="string"){
                 if (""!==($scope.editOrgModel.foundationDate)) {
                     $scope.editOrgModel.foundationDate = new Date($scope.editOrgModel.foundationDate);

atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.ctrl.js

@@ -738,9 +738,16 @@
                 logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
             }
 
+            if($scope.checkedCompanyCodeList.length == 0){
+                SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
+                return;
+            }
             var period = $scope.UploadPeriodTime;
+            if(period == null){
+                SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
+                return;
+            }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
-            // var orgIds = $scope.checkedCompanyList;
 
             Upload.upload({
                 url: $scope.importATExcelFile,

atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.html

@@ -12,11 +12,11 @@
             <div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%;margin-bottom: -38px;">
                 <div class="import-wrapper">
                     <div class="row">
-                        <div class="col-sm-6 leftNav">
+                        <div class="col-sm-6 leftNav"  style="width: 60%;">
                             <span class="text-bold" translate="SelectedOrganization"></span>:
                             <div class="dropdown" style="margin-left:10px">
                                 <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
-                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
+                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
                                     {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
                                     <span class="caret" style="float: right "></span>
                                 </button>
@@ -31,7 +31,7 @@
                                             <input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
                                                    ng-checked="selectedOne"
                                                    style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
-                                            <span style="margin-left:5px;text-align: left;">{{i.name}}</span>
+                                            <span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
                                         </div>
                                     </li>
                                 </ul>
@@ -43,7 +43,7 @@
                                 <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                             </div>
                             <div ng-show="fileName" style="display:inline-block">
-                                <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
+                                <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
                             </div>
                         </div>
 

atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.ctrl.js

@@ -712,7 +712,15 @@
                 logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
             }
 
+            if($scope.checkedCompanyCodeList.length == 0){
+                SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
+                return;
+            }
             var period = $scope.UploadPeriodTime;
+            if(period == null){
+                SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
+                return;
+            }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
 
             Upload.upload({

atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.html

@@ -16,7 +16,7 @@
                            <span class="text-bold" translate="SelectedOrganization"></span>:
                            <div class="dropdown" style="margin-left:10px">
                                <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
-                                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
+                                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
                                    {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
                                    <span class="caret" style="float: right "></span>
                                </button>
@@ -27,12 +27,12 @@
                                    <li role="separator" class="divider" style="height: 1px;margin: 9px 0;
                                                 overflow: hidden;background-color: #e5e5e5;"></li>
                                    <li ng-repeat="i in companyList">
-                                       <div class="checkbox-custom checkbox-default">
-                                           <input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
-                                                  ng-checked="selectedOne"
-                                                  style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
-                                           <span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
-                                       </div>
+                                        <div class="checkbox-custom checkbox-default">
+                                            <input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
+                                                ng-checked="selectedOne"
+                                                style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
+                                            <span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
+                                        </div>  
                                    </li>
                                </ul>
                            </div>
@@ -43,7 +43,7 @@
                                <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                            </div>
                            <div ng-show="fileName" style="display:inline-block">
-                               <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
+                               <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
                            </div>
                        </div>
                        <div class="col-sm-6 rightNav " style="width: 40%;margin-top: 10px;">

atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.ctrl.js

@@ -716,9 +716,16 @@
                 logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
             }
 
+            if($scope.checkedCompanyCodeList.length == 0){
+                SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
+                return;
+            }
             var period = $scope.UploadPeriodTime;
+            if(period == null){
+                SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
+                return;
+            }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
-
             Upload.upload({
                 url: $scope.importCFExcelFile,
                 data: {

atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.html

@@ -16,7 +16,7 @@
                             <span class="text-bold" translate="SelectedOrganization"></span>:
                             <div class="dropdown" style="margin-left:10px">
                                 <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
-                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
+                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
                                     {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
                                     <span class="caret" style="float: right "></span>
                                 </button>
@@ -43,7 +43,7 @@
                                 <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                             </div>
                             <div ng-show="fileName" style="display:inline-block">
-                                <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
+                                <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
                             </div>
                         </div>
                         <div  class="col-sm-6 rightNav" style="width: 40%;margin-top: 10px;">

atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.html

@@ -16,7 +16,7 @@
                             <span class="text-bold" translate="SelectedOrganization"></span>:
                             <div class="dropdown" style="margin-left:10px">
                                 <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
-                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="auto">
+                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
                                     {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
                                     <span class="caret" style="float: right "></span>
                                 </button>
@@ -43,7 +43,7 @@
                                 <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                             </div>
                             <div ng-show="fileName" style="display:inline-block">
-                                <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
+                                <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
                             </div>
                         </div>
                         <div style = "width:40%; margin-top: 10px;" class="col-sm-6 rightNav">

atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.html

@@ -11,7 +11,7 @@
                     <span class="text-bold" translate="SelectedOrganization"></span>:
                     <div class="dropdown" style="margin-left:10px">
                         <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
-                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
+                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width:200px;">
                             {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
                             <span class="caret" style="float: right "></span>
                         </button>
@@ -26,7 +26,7 @@
                                     <input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
                                            ng-checked="selectedOne"
                                            style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
-                                    <span style="margin-left:5px;text-align: left;">{{i.name}}</span>
+                                    <span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
                                 </div>
                             </li>
                         </ul>
@@ -38,7 +38,7 @@
                         <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                     </div>
                     <div ng-show="fileName" style="display:inline-block">
-                        <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
+                        <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
                     </div>
                     <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"

atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.html

@@ -11,7 +11,7 @@
                     <span class="text-bold" translate="SelectedOrganization"></span>:
                     <div class="dropdown" style="margin-left:10px">
                         <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
-                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
+                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
                             {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
                             <span class="caret" style="float: right "></span>
                         </button>
@@ -26,7 +26,7 @@
                                     <input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
                                            ng-checked="selectedOne"
                                            style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
-                                    <span style="margin-left:5px;text-align: left;">{{i.name}}</span>
+                                    <span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
                                 </div>
                             </li>
                         </ul>
@@ -38,7 +38,7 @@
                         <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                     </div>
                     <div ng-show="fileName" style="display:inline-block">
-                        <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
+                        <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
                     </div>
                     <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"

atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.html

@@ -11,7 +11,7 @@
                     <span class="text-bold" translate="SelectedOrganization"></span>:
                     <div class="dropdown" style="margin-left:10px">
                         <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
-                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
+                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
                             {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
                             <span class="caret" style="float: right "></span>
                         </button>
@@ -26,7 +26,7 @@
                                     <input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
                                            ng-checked="selectedOne"
                                            style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
-                                    <span style="margin-left:5px;text-align: left;">{{i.name}}</span>
+                                    <span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
                                 </div>
                             </li>
                         </ul>

atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.html

@@ -11,7 +11,7 @@
                     <span class="text-bold" translate="SelectedOrganization"></span>:
                     <div class="dropdown" style="margin-left:10px">
                         <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
-                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
+                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
                             {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
                             <span class="caret" style="float: right "></span>
                         </button>
@@ -26,7 +26,7 @@
                                     <input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
                                            ng-checked="selectedOne"
                                            style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
-                                    <span style="margin-left:5px;text-align: left;">{{i.name}}</span>
+                                    <span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
                                 </div>
                             </li>
                         </ul>
@@ -38,7 +38,7 @@
                         <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                     </div>
                     <div ng-show="fileName" style="display:inline-block">
-                        <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
+                        <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
                     </div>
                     <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"

atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.html

@@ -11,7 +11,7 @@
                     <span class="text-bold" translate="SelectedOrganization"></span>:
                     <div class="dropdown" style="margin-left:10px">
                         <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
-                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 380px;">
+                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
                             {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
                             <span class="caret" style="float: right "></span>
                         </button>
@@ -26,7 +26,7 @@
                                     <input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
                                            ng-checked="selectedOne"
                                            style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
-                                    <span style="margin-left:5px;text-align: left;">{{i.name}}</span>
+                                    <span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
                                 </div>
                             </li>
                         </ul>
@@ -38,7 +38,7 @@
                         <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                     </div>
                     <div ng-show="fileName" style="display:inline-block">
-                        <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
+                        <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
                     </div>
                     <button type="button"
                             ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"

atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.ctrl.js

@@ -181,10 +181,16 @@
                 logDto.OperationName = $translate.instant('AddImportProfitLoss');
                 logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
             }
-
+            if($scope.checkedCompanyCodeList.length == 0){
+                SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
+                return;
+            }
             var period = $scope.UploadPeriodTime;
+            if(period == null){
+                SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
+                return;
+            }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
-
             Upload.upload({
                 url: $scope.importCPRExcelFile,
                 data: {
@@ -209,6 +215,7 @@
                     logDto.UpdateState = $translate.instant('ImportSuccess');
                     vatOperationLogService.addOperationLog(logDto);
                     SweetAlert.success($translate.instant('ImportSuccess'));
+                    $scope.fileNameShow=false;
                 } else {
                     if (ret.resultMsg && ret.resultMsg.length > 0) {
                         SweetAlert.warning($translate.instant(ret.resultMsg));
@@ -355,6 +362,7 @@
                 return;
             }
             $scope.fileName = fileName.name;
+            $scope.fileNameShow = $scope.fileName?true:false;
             //初始化数据
             $scope.selectedMappingList = [];
             $scope.ImportErrorTab = false;
@@ -404,7 +412,7 @@
 
 
         var setButtonWrapStyle = function () {
-            if ($scope.fileName) {
+            if ($scope.fileNameShow) {
                 return { width: "100%" };
             }
         };

atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.html

@@ -2,7 +2,8 @@
     <!--标题-->
     <div class="nav-wrapper">
         <div class="nav-header" translate="CoupaPurchasingReportTitle"></div>
-        <div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab" ng-click="toggleErrorTab()">
+        <div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab"
+            ng-click="toggleErrorTab()">
             <i class="fa fa-exclamation-circle" aria-hidden="true"></i>{{errorMsg}}
         </div>
     </div>
@@ -11,86 +12,79 @@
         <form class="form-inline" id="navigationForm" name="navigationForm">
             <div class="form-group" ng-style="setButtonWrapStyle()" style="margin-bottom: -38px; width: 100%;">
                 <div class="import-wrapper">
-                   <div class="col-sm-6 leftNav">
-                       <span class="text-bold" translate="SelectedOrganization"></span>:
-                       <div class="dropdown" style="margin-left:10px">
-                           <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
-                                   data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
-                               {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
-                               <span class="caret" style="float: right "></span>
-                           </button>
-                           <ul class="dropdown-menu" style="width: 380px;" aria-labelledby="dropdownMenu1">
-                               <li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
-                                          style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
-                                   <span style="margin-left:5px;float: left;">全选</span></li>
-                               <li role="separator" class="divider" style="height: 1px;margin: 9px 0;
+                    <div class="col-sm-6 leftNav"  style="width: 60%;">
+                        <span class="text-bold" translate="SelectedOrganization"></span>:
+                        <div class="dropdown" style="margin-left:10px">
+                            <button class="btn btn-default dropdown-toggle" style="width:200px;" type="button"
+                                id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                                {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
+                                <span class="caret" style="float: right "></span>
+                            </button>
+                            <ul class="dropdown-menu" style="width: 400px;" aria-labelledby="dropdownMenu1">
+                                <li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
+                                        style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
+                                    <span style="margin-left:5px;float: left;">全选</span></li>
+                                <li role="separator" class="divider" style="height: 1px;margin: 9px 0;
                                                 overflow: hidden;background-color: #e5e5e5;"></li>
-                               <li ng-repeat="i in companyList">
-                                   <div class="checkbox-custom checkbox-default">
-                                       <input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
-                                              ng-checked="selectedOne"
-                                              style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
-                                       <span style="margin-left:5px;text-align: left;">{{i.name}}</span>
-                                   </div>
-                               </li>
-                           </ul>
-                       </div>
-                       <span class="text-bold" translate="InvoiceQJ"></span>:
-                       <div class="period-picker" style="margin-left:10px">
-                           <input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;"
-                                  readonly="readonly" ng-model="UploadPeriodTime"/>
-                           <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
-                       </div>
-                       <div ng-show="fileName" style="display:inline-block">
-                           <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
-                       </div>
-                   </div>
-                   <div class="col-sm-6 rightNav" style="width: 40%;margin-top: 10px;">
-                       <button type="button"
-                               ngf-select="" type="file" ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
-                               ngf-allow-dir="false" class="btn btn-vat-third" >
-                           {{'SelectFile' | translate}}
-                       </button>
-                       <button type="button"
-                               class="btn btn-vat-primary"
-                               translate="TemplateBtn"
-                               ng-click="downloadTemplate()"></button>
+                                <li ng-repeat="i in companyList">
+                                    <div class="checkbox-custom checkbox-default">
+                                        <input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
+                                               ng-checked="selectedOne"
+                                               style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
+                                        <span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
+                                    </div>
+                                </li>
+                            </ul>
+                        </div>
+                        <span class="text-bold" translate="InvoiceQJ"></span>:
+                        <div class="period-picker" style="margin-left:10px">
+                            <input type="text" id="periodDatepicker" class="datepicker imp-subheader"
+                                style="width:120px;" readonly="readonly" ng-model="UploadPeriodTime" />
+                            <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
+                        </div>
+                        <div ng-show="fileNameShow" style="display:inline-block">
+                            <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
+                        </div>
+                    </div>
+                    <div class="col-sm-6 rightNav" style="width: 40%;margin-top: 10px;">
+                        <button type="button" ngf-select="" type="file" ng-model="importExcelFile"
+                            ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
+                            ngf-allow-dir="false" class="btn btn-vat-third">
+                            {{'SelectFile' | translate}}
+                        </button>
+                        <button type="button" class="btn btn-vat-primary" translate="TemplateBtn"
+                            ng-click="downloadTemplate()"></button>
 
-                       <button type="button "
-                               class="btn btn-vat-primary topButton"
-                               translate="AddImportBtn"
-                               ng-click="doUploadCPR(importEnum.AddImport)"></button>
+                        <button type="button " class="btn btn-vat-primary topButton" translate="AddImportBtn"
+                            ng-click="doUploadCPR(importEnum.AddImport)"></button>
 
-                       <button type="button"
-                               class="btn btn-vat-primary  topButton"
-                               translate="CoverImportBtn"
-                               ng-click="doUploadCPR(importEnum.CoverImport)"></button>
+                        <button type="button" class="btn btn-vat-primary  topButton" translate="CoverImportBtn"
+                            ng-click="doUploadCPR(importEnum.CoverImport)"></button>
 
 
 
-                       <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
-                           <button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
-                                   permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
-                                   translate="ConverImportBtn"
-                                   ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
-                           <button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
-                                   permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
-                                   translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
-                       </div>
-                   </div>
+                        <div class="btn-wrapper" ng-if="!isShowImportTotalBtn">
+                            <button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
+                                permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                                translate="ConverImportBtn"
+                                ng-click="doUploadTbResult(importEnum.CoverImport)"></button>|
+                            <button class="btn btn-vat-primary topButton" atms-permission permission-control-type="ngIf"
+                                permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
+                                translate="AddImportBtn" ng-click="doUploadTbResult(importEnum.AddImport)"></button>
+                        </div>
+                    </div>
                 </div>
             </div>
         </form>
-      
+
         <div class="dt-init-wrapper">
             <div class="dx-viewport grid-container">
                 <div id="importCPRStatusGridContainer" dx-data-grid="importCPRStatusGridOptions"
-                     style="margin-top: 30px;">
+                    style="margin-top: 30px;">
                 </div>
             </div>
             <div class="page-footer">
-                <ack-pagination page-options="pagingOptions"
-                                refresh-table="refreshConfigGrid()"></ack-pagination>
+                <ack-pagination page-options="pagingOptions" refresh-table="refreshConfigGrid()"></ack-pagination>
             </div>
         </div>
     </div>
@@ -116,8 +110,4 @@
     </script>
 
     <vat-operate-log period="period" module-type="moduleid" is-show="isShowLog"></vat-operate-log>
-</div>
-
-
-
-
+</div>
\ No newline at end of file

atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.ctrl.js

@@ -137,7 +137,15 @@
                 logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
             }
 
+            if($scope.checkedCompanyCodeList.length == 0){
+                SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
+                return;
+            }
             var period = $scope.UploadPeriodTime;
+            if(period == null){
+                SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
+                return;
+            }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
 
             Upload.upload({

atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.html

@@ -12,11 +12,11 @@
             <div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%; margin-bottom: -38px;">
                 <div class="import-wrapper">
                     <div class="row">
-                        <div class="col-sm-6 leftNav ">
+                        <div class="col-sm-6 leftNav "  style="width: 60%;">
                             <span class="text-bold" translate="SelectedOrganization"></span>:
                             <div class="dropdown" style="margin-left:10px">
                                 <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
-                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
                                     {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
                                     <span class="caret" style="float: right "></span>
                                 </button>
@@ -43,7 +43,7 @@
                                 <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                             </div>
                             <div ng-show="fileName" style="display:inline-block">
-                                <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
+                                <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
                             </div>
                         </div>
                         <div class="col-sm-6 rightNav" style="width: 40%; margin-top: 10px;">

atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.ctrl.js

@@ -164,10 +164,16 @@
                 logDto.OperationName = $translate.instant('AddImportProfitLoss');
                 logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
             }
-
+            if($scope.checkedCompanyCodeList.length == 0){
+                SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
+                return;
+            }
             var period = $scope.UploadPeriodTime;
+            if(period == null){
+                SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
+                return;
+            }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
-
             Upload.upload({
                 url: $scope.importIRExcelFile,
                 data: {
@@ -192,6 +198,7 @@
                     logDto.UpdateState = $translate.instant('ImportSuccess');
                     vatOperationLogService.addOperationLog(logDto);
                     SweetAlert.success($translate.instant('ImportSuccess'));
+                    $scope.fileNameShow = false;
                 } else {
                     if (ret.resultMsg && ret.resultMsg.length > 0) {
                         SweetAlert.warning($translate.instant(ret.resultMsg));
@@ -346,6 +353,7 @@
                 return;
             }
             $scope.fileName = fileName.name;
+            $scope.fileNameShow = $scope.fileName?true:false;
             //初始化数据
             $scope.selectedMappingList = [];
             $scope.ImportErrorTab = false;

atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.html

@@ -16,7 +16,7 @@
                             <span class="text-bold" translate="SelectedOrganization"></span>:
                             <div class="dropdown" style="margin-left:10px">
                                 <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
-                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
+                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
                                     {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
                                     <span class="caret" style="float: right "></span>
                                 </button>
@@ -42,8 +42,8 @@
                                        readonly="readonly" ng-model="UploadPeriodTime"/>
                                 <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                             </div>
-                            <div ng-show="fileName" style="display:inline-block">
-                                <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
+                            <div ng-show="fileNameShow" style="display:inline-block">
+                                <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
                             </div>
                         </div>
                         <div class="col-sm-6 col-xs-6  col-lg-6 rightNav" style="width: 40%; margin-top: 10px" >

atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.ctrl.js

@@ -166,7 +166,15 @@
                 logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
             }
 
+            if($scope.checkedCompanyCodeList.length == 0){
+                SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
+                return;
+            }
             var period = $scope.UploadPeriodTime;
+            if(period == null){
+                SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
+                return;
+            }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
 
             Upload.upload({

atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.html

@@ -12,11 +12,11 @@
             <div class="form-group" ng-style="setButtonWrapStyle()" style="width: 100%;margin-bottom: -38px;">
                 <div class="import-wrapper">
                     <div class="row">
-                        <div class="col-sm-6 leftNav">
+                        <div class="col-sm-6 leftNav"  style="width: 60%;">
                             <span class="text-bold" translate="SelectedOrganization"></span>:
                             <div class="dropdown" style="margin-left:10px">
                                 <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
-                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
+                                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
                                     {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
                                     <span class="caret" style="float: right "></span>
                                 </button>
@@ -43,7 +43,7 @@
                                 <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                             </div>
                             <div ng-show="fileName" style="display:inline-block">
-                                <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
+                                <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
                             </div>
                         </div>
                         <div class="col-sm-6 rightNav" style="width: 40%; margin-top: 10px;">

atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.ctrl.js

@@ -165,7 +165,15 @@
                 logDto.OperationType = enums.vatLogOperationTypeEnum.AddImport;
             }
 
+            if($scope.checkedCompanyCodeList.length == 0){
+                SweetAlert.warning($translate.instant('PleaseSelectOrganization'));
+                return;
+            }
             var period = $scope.UploadPeriodTime;
+            if(period == null){
+                SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
+                return;
+            }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
 
             Upload.upload({

atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.html

@@ -2,13 +2,14 @@
     <!--标题-->
     <div class="nav-wrapper">
         <div class="nav-header" translate="RedLetterInformationTableTitle"></div>
-        <div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab" ng-click="toggleErrorTab()">
+        <div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab"
+            ng-click="toggleErrorTab()">
             <i class="fa fa-exclamation-circle" aria-hidden="true"></i>{{errorMsg}}
         </div>
     </div>
     <!--导航栏-->
     <div id="tab_total">
-       <!-- <form class="form-inline" id="navigationForm" name="navigationForm">
+        <!-- <form class="form-inline" id="navigationForm" name="navigationForm">
             <div class="form-group" >
                 <div class="import-wrapper1">
                     <span class="text-bold" translate="SelectedOrganization"></span>:
@@ -65,53 +66,76 @@
             </div>
         </form>-->
         <form class="form-inline">
-        <div class="form-group" style="margin-bottom: -38px;width: 100%" >
-            <div class="row">
-                <div class="col-sm-6 leftNav" style="width: 60%">
-                    <label class="col-sm-1 control-label marTop">{{'SelectedOrganization' | translate}}：</label>
-                    <div class="col-sm-3 marTop">
+            <div class="form-group" style="margin-bottom: -38px;width: 100%">
+                <div class="import-wrapper">
+                    <div class="col-sm-6 leftNav"  style="width: 60%;">
+                        <span class="text-bold" translate="SelectedOrganization"></span>:
+                        <div class="dropdown" style="margin-left:10px">
+                            <button class="btn btn-default dropdown-toggle" style="width: 200px;" type="button"
+                                id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 200px;">
+                                {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
+                                <span class="caret" style="float: right "></span>
+                            </button>
+                            <ul class="dropdown-menu" style="width: 400px;" aria-labelledby="dropdownMenu1">
+                                <li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
+                                        style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
+                                    <span style="margin-left:5px;float: left;">全选</span></li>
+                                <li role="separator" class="divider" style="height: 1px;margin: 9px 0;
+                                                overflow: hidden;background-color: #e5e5e5;"></li>
+                                <li ng-repeat="i in companyList">
+                                    <div class="checkbox-custom checkbox-default">
+                                        <input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
+                                               ng-checked="selectedOne"
+                                               style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
+                                        <span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
+                                    </div>
+                                </li>
+                            </ul>
+                        </div>
+                        <span class="text-bold" translate="InvoiceQJ"></span>:
+                        <div class="period-picker" style="margin-left:10px">
+                            <input type="text" id="periodDatepicker" class="datepicker imp-subheader"
+                                style="width:120px;" readonly="readonly" ng-model="UploadPeriodTime" />
+                            <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
+                        </div>
+                        <!-- <label class="col-sm-2 control-label marTop">{{'SelectedOrganization' | translate}}：</label>
+                    <div class="col-sm-5 marTop">
                         <div dx-tag-box="selectOrgOptions" style="position: relative;    left: 33px;"></div>
                     </div>
-                    <label class="col-sm-1 control-label marTop" style="margin-left: 60px;">{{'InvoiceQJ' | translate}}：</label>
-                    <div class="col-sm-1 marTop" style="    width: 14%;">
+                    <label class="col-sm-2 control-label marTop" style="margin-left: 60px;">{{'InvoiceQJ' | translate}}：</label>
+                    <div class="col-sm-3 marTop" style="    width: 14%;">
                         <input type="text" id="periodDatepicker" class="datepicker form-control imp-subheader" style="width:120px; display: inline-block"
                                readonly="readonly" ng-model="UploadPeriodTime"/>
                         <i class="fa fa-calendar imp-subheader red-color" style="    position: relative;    right: relative;    right: -100px;    top: -26px;"></i>
+                    </div> -->
                     </div>
-                </div>
-                <div class="col-sm-6  rightNav"  style="margin-top: 10px; width: 40%">
-                    <button type="button"
-                            ngf-select="" type="file"  ng-model="importExcelFile" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
-                            ngf-allow-dir="false" class="btn btn-vat-third" >
-                        {{'SelectFile' | translate}}
-                    </button>
-                    <span ng-show="fileName" class="marTop" title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
-                    <button type="button"
-                            class="btn btn-vat-primary"
-                            translate="TemplateBtn"
+                    <div class="col-sm-6  rightNav" style="margin-top: 10px; width: 40%">
+                        <button type="button" ngf-select="" type="file" ng-model="importExcelFile"
+                            ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
+                            ngf-allow-dir="false" class="btn btn-vat-third">
+                            {{'SelectFile' | translate}}
+                        </button>
+                        <span ng-show="fileName" class="marTop"
+                            title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>
+                        <button type="button" class="btn btn-vat-primary" translate="TemplateBtn"
                             ng-click="downloadTemplate()"></button>
-                    <button type="button"
-                            class="btn btn-vat-primary topButton"
-                            translate="CoverImportBtn"
+                        <button type="button" class="btn btn-vat-primary topButton" translate="CoverImportBtn"
                             ng-click="doUploadRLIT(importEnum.CoverImport)"></button>
-                    <button type="button"
-                            class="btn btn-vat-primary topButton"
-                            translate="AddImportBtn"
+                        <button type="button" class="btn btn-vat-primary topButton" translate="AddImportBtn"
                             ng-click="doUploadRLIT(importEnum.AddImport)"></button>
+                    </div>
                 </div>
             </div>
-        </div>
         </form>
-      
+
         <div class="dt-init-wrapper">
             <div class="dx-viewport grid-container">
                 <div id="importRLITStatusGridContainer" dx-data-grid="importRLITStatusGridOptions"
-                     style="margin-top: 30px;">
+                    style="margin-top: 30px;">
                 </div>
             </div>
             <div class="page-footer">
-                <ack-pagination page-options="pagingOptions"
-                                refresh-table="refreshConfigGrid()"></ack-pagination>
+                <ack-pagination page-options="pagingOptions" refresh-table="refreshConfigGrid()"></ack-pagination>
             </div>
         </div>
     </div>
@@ -137,8 +161,4 @@
     </script>
 
     <vat-operate-log period="period" module-type="moduleid" is-show="isShowLog"></vat-operate-log>
-</div>
-
-
-
-
+</div>
\ No newline at end of file

atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js

@@ -908,23 +908,23 @@
                             $state.go('vat.importData.erpImport');
                         } else if (data[constant.vatPermission.dataPreview.trialBalance.queryCode]) {
                             $state.go('vat.previewData.trialBalance');
-                        } else if (data[constant.vatPermission.previewData.profitLoss.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.profitLoss.queryCode]) {
                             $state.go('vat.previewData.profitLoss');
-                        } else if (data[constant.vatPermission.previewData.offBalanceSheet.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.offBalanceSheet.queryCode]) {
                             $state.go('vat.previewData.offBalanceSheet');
-                        } else if (data[constant.vatPermission.previewData.journal.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.journal.queryCode]) {
                             $state.go('vat.previewData.journal');
-                        } else if (data[constant.vatPermission.previewData.cashFlow.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.cashFlow.queryCode]) {
                             $state.go('vat.previewData.cashFlow');
-                        } else if (data[constant.vatPermission.previewData.invoiceRecord.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.invoiceRecord.queryCode]) {
                             $state.go('vat.previewData.invoiceRecord');
-                        } else if (data[constant.vatPermission.previewData.certifiedInvoicesList.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.certifiedInvoicesList.queryCode]) {
                             $state.go('vat.previewData.certifiedInvoicesList');
-                        } else if (data[constant.vatPermission.previewData.redLetterInformationTable.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.redLetterInformationTable.queryCode]) {
                             $state.go('vat.previewData.redLetterInfoTab');
-                        } else if (data[constant.vatPermission.previewData.coupaPurchasingReport.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.coupaPurchasingReport.queryCode]) {
                             $state.go('vat.previewData.coupaPurchasingReport');
-                        } else if (data[constant.vatPermission.previewData.invoiceData.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.invoiceData.queryCode]) {
                             $state.go('vat.previewData.invoiceData');
                         } else if (data[constant.vatPermission.dataManage.caculateDataCode]) {
                             $state.go('vat.reductionData.caculateData');

atms-web/src/main/webapp/app/vat/import/vat-import-output-invoice/vat-import-output-invoice.html

 <div class="vat-import-output-invoice">
     <div class="nav-wrapper">
         <div class="nav-header" translate="OutputInvoiceTitle"></div>
-        <div class="nav-tab">
-        <span class="active" ng-click="switchTab($event)" translate="OutputInvoiceTab"></span><span ng-click="switchTab($event)" >{{ 'EvidenceTab' | translate }}{{evidenceTotalCount}}</span>
-        </div>    
+        <!-- <div class="nav-tab"> -->
+        <!-- <span class="active" ng-click="switchTab($event)" translate="OutputInvoiceTab"></span> -->
+        <!-- <span ng-click="switchTab($event)" >{{ 'EvidenceTab' | translate }}{{evidenceTotalCount}}</span> -->
+        <!-- </div>     -->
     </div>
     <!--销项界面-->
     <div id="tab_total">