Merge branch 'release-201845-wangcz'

src/main/java/com/uas/platform/b2c/prod/commodity/model/CommodityInOutbound.java

@@ -39,7 +39,7 @@ public class CommodityInOutbound implements Serializable {
 
     /**
      * 所属企业
-     * 如果是个人，就保存个人的uu
+     * 如果是个人，就保存个人uu
      */
     @Column(name = "cio_enuu")
     private Long enuu;
@@ -327,8 +327,8 @@ public class CommodityInOutbound implements Serializable {
             this.enName = user.getUserName();
         }
         this.createTime = new Date();
-        this.operaterUseruu = SystemSession.getUser().getUserUU();
-        this.operaterUserName = SystemSession.getUser().getUserName();
+        this.operaterUseruu = user.getUserUU();
+        this.operaterUserName = user.getUserName();
     }
 
 

src/main/java/com/uas/platform/b2c/prod/commodity/service/ProductPrivateService.java

@@ -48,4 +48,12 @@ public interface ProductPrivateService {
      * @return
      */
     List<ProductPrivate> newProductPrivateIfNotExist(List<Long> prIds);
+
+    /**
+     * 通过jdbcTemplate 批量存储物料私有信息
+     *
+     * @param privateList 商城私有物料
+     * @return 存储条数
+     */
+    Integer saveByJdbcTemplate(List<ProductPrivate> privateList);
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/ProductService.java

@@ -326,8 +326,8 @@ public interface ProductService {
     List<Product> findProductsByProdNums(List<String> prodNums);
 
     /**
-     * 根物料标号，获取物料编号和物料id
      * @param prodNums  物料编号list
+     * 根物料标号，获取物料编号和物料id
      * @return 返回物料信息。
      */
     List<Product> findProductIdAndProdnumsByProdNums(List<String> prodNums);

src/main/java/com/uas/platform/b2c/prod/commodity/service/ReleaseProductByBatchService.java

@@ -191,4 +191,11 @@ public interface ReleaseProductByBatchService {
      * @return Object
      */
     Object readWorkBookCell(Cell cell, int cellType, int r, int n);
+
+    /**
+     * 批量保存临时表信息
+     *
+     * @param releaseProductByBatchArrayList 临时表数据
+     */
+    void saveByJdbcTemplate(List<ReleaseProductByBatch> releaseProductByBatchArrayList);
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductPrivateServiceImpl.java

@@ -11,7 +11,11 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 商城私有字段的服务层
@@ -169,4 +173,28 @@ public class ProductPrivateServiceImpl implements ProductPrivateService {
             return productPrivateDao.save(productPrivate);
         }
     }
+
+    /**
+     * 通过jdbcTemplate 批量存储物料私有信息
+     *
+     * @param privateList 商城私有物料
+     * @return 存储条数
+     */
+    @Override
+    public Integer saveByJdbcTemplate(List<ProductPrivate> privateList) {
+        String insertSql = "insert IGNORE product$private(pr_b2cenabled, pr_batchcount, pr_id, pr_attach) values (?,?,?,?)";
+        System.out.println("私有库批量保存语句： " + insertSql);
+        int[][] size = new int[0][];
+        if (CollectionUtils.isNotEmpty(privateList)) {
+            size = jdbcTemplate.batchUpdate(insertSql,
+                    privateList, privateList.size(), (ps, t) -> {
+                        ps.setObject(1, t.getB2cEnabled());
+                        ps.setObject(2, t.getBatchCount());
+                        ps.setObject(3, t.getPrId());
+                        ps.setObject(4, t.getAttach());
+                    });
+            System.out.println(size);
+        }
+        return size[0][0];
+    }
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -17,7 +17,6 @@ import com.uas.platform.b2c.prod.commodity.constant.ModifyConstant;
 import com.uas.platform.b2c.prod.commodity.constant.ShortConstant;
 import com.uas.platform.b2c.prod.commodity.constant.StringConstant;
 import com.uas.platform.b2c.prod.commodity.constant.UploadConstant;
-import com.uas.platform.b2c.prod.commodity.controller.ReleaseProductByBatchController;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
 import com.uas.platform.b2c.prod.commodity.dao.PCBDao;
 import com.uas.platform.b2c.prod.commodity.dao.PcbPropertyvalueDao;
@@ -104,7 +103,17 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.regex.Matcher;
@@ -2242,4 +2251,86 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 	public void deleteAllInfo() {
 		releaseProductByBatchDao.deleteAll();
 	}
+
+	/**
+	 * 批量保存临时表信息
+	 *
+	 * @param releaseProductByBatchArrayList 临时表数据
+	 */
+	@Override
+	public void saveByJdbcTemplate(List<ReleaseProductByBatch> releaseProductByBatchArrayList) {
+        if (CollectionUtils.isNotEmpty(releaseProductByBatchArrayList)) {
+            jdbcTemplate.batchUpdate("insert INTO trade$releasebybatch(" +
+                            "rel_brandid,rel_brandcn,rel_branden,rel_breakup,rel_breakupstr,rel_code,rel_createdate,rel_currency,rel_encapsulation,rel_errmsg," +
+                            "rel_img,rel_maxpricermb,rel_maxpriceusd,rel_minbuyqty,rel_minbuyqtystr,rel_minpackpricestr,rel_minpackage,rel_minpackagestr,rel_minpricermb,rel_minpriceusd," +
+                            "rel_original,rel_packaging,rel_publishername,rel_publishertel,rel_publisheruu,rel_batchid,rel_releasecode,rel_releasestatus,rel_remark,rel_publishreserve," +
+                            "rel_publishreservestr,rel_returninweek,rel_rmbprice,rel_rmb_tax_rate,rel_sampleqty,rel_selfmaxdelivery,rel_selfmaxdeliverystr,rel_selfmindelivery,rel_selfmindeliverystr,rel_shiparea," +
+                            "rel_storename,rel_storeid,rel_unit,rel_usdprice,rel_usd_tax_rate,rel_b2cbrandcn,rel_b2cbranden,rel_b2ccode,rel_b2cuuid,rel_b2cbrandid," +
+                            "rel_b2cbranduuid,rel_b2ckindname,rel_b2ckindid,rel_tag,rel_tag_str,rel_spec) " +
+                            "values (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?)",
+                    releaseProductByBatchArrayList, releaseProductByBatchArrayList.size(), (ps, t) -> {
+                        ps.setObject(1, t.getBrandId());
+                        ps.setObject(2, t.getB2cBrandcn());
+                        ps.setObject(3, t.getB2cBranden());
+                        ps.setObject(4, t.getBreakUp());
+                        ps.setObject(5, t.getBreakUpStr());
+                        ps.setObject(6, t.getCode());
+                        ps.setObject(7, t.getCreateDate());
+                        ps.setObject(8, t.getCurrency());
+                        ps.setObject(9, t.getEncapsulation());
+                        ps.setObject(10, t.getErrmsg());
+
+                        ps.setObject(11, t.getImg());
+                        ps.setObject(12, t.getMaxPriceRMB());
+                        ps.setObject(13, t.getMaxPriceUSD());
+                        ps.setObject(14, t.getMinBuyQty());
+                        ps.setObject(15, t.getMinBuyQtyStr());
+                        ps.setObject(16, t.getMinPackPriceStr());
+                        ps.setObject(17, t.getMinPackage());
+                        ps.setObject(18, t.getMinPackageStr());
+                        ps.setObject(19, t.getMinPriceRMB());
+                        ps.setObject(20, t.getMinPriceUSD());
+
+                        ps.setObject(21, t.getOriginal());
+                        ps.setObject(22, t.getPackaging());
+                        ps.setObject(23, t.getPublisherName());
+                        ps.setObject(24, t.getPublisherTel());
+                        ps.setObject(25, t.getPublisherUu());
+                        ps.setObject(26, t.getRelbatchid());
+                        ps.setObject(27, t.getReleaseCode());
+                        ps.setObject(28, t.getReleaseStatus());
+                        ps.setObject(29, t.getRemark());
+                        ps.setObject(30, t.getReserve());
+
+                        ps.setObject(31, t.getReserveStr());
+                        ps.setObject(32, t.getReturnInWeek());
+                        ps.setObject(33, t.getRmbMinPackPrice());
+                        ps.setObject(34, t.getRmbTaxRate());
+                        ps.setObject(35, t.getSampleqty());
+                        ps.setObject(36, t.getSelfMaxDelivery());
+                        ps.setObject(37, t.getSelfMaxDeliveryStr());
+                        ps.setObject(38, t.getSelfMinDelivery());
+                        ps.setObject(39, t.getSelfMinDeliveryStr());
+                        ps.setObject(40, t.getShipArea());
+
+                        ps.setObject(41, t.getStoreName());
+                        ps.setObject(42, t.getStoreid());
+                        ps.setObject(43, t.getUnit());
+                        ps.setObject(44, t.getUsdMinPackPrice());
+                        ps.setObject(45, t.getUsdTaxRate());
+                        ps.setObject(46, t.getB2cBrandcn());
+                        ps.setObject(47, t.getB2cBranden());
+                        ps.setObject(48, t.getB2cCode());
+                        ps.setObject(49, t.getComponentUuId());
+                        ps.setObject(50, t.getBrandId());
+
+                        ps.setObject(51, t.getBranduuid());
+                        ps.setObject(52, t.getKindName());
+                        ps.setObject(53, t.getKindUuid());
+                        ps.setObject(54, t.getTag());
+                        ps.setObject(55, t.getTagstr());
+                        ps.setObject(56, t.getSpec());
+                    });
+        }
+	}
 }

src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseProductServiceImpl.java

@@ -10,21 +10,19 @@ import com.uas.platform.b2c.core.utils.StringUtilB2C;
 import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
 import com.uas.platform.b2c.prod.commodity.constant.ErrorInfoConstant;
 import com.uas.platform.b2c.prod.commodity.constant.UploadConstant;
-import com.uas.platform.b2c.prod.commodity.dao.ProductDao;
-import com.uas.platform.b2c.prod.commodity.dao.ProductPrivateDao;
 import com.uas.platform.b2c.prod.commodity.dao.ReleaseProductByBatchDao;
 import com.uas.platform.b2c.prod.commodity.dao.V_ProductPrivateDao;
 import com.uas.platform.b2c.prod.commodity.model.Product;
 import com.uas.platform.b2c.prod.commodity.model.ProductPrivate;
 import com.uas.platform.b2c.prod.commodity.model.ReleaseProductByBatch;
 import com.uas.platform.b2c.prod.commodity.model.V_ProductPrivate;
-import com.uas.platform.b2c.prod.commodity.service.GoodsService;
+import com.uas.platform.b2c.prod.commodity.service.ProductPrivateService;
 import com.uas.platform.b2c.prod.commodity.service.ProductService;
 import com.uas.platform.b2c.prod.commodity.service.ReleaseProductByBatchService;
 import com.uas.platform.b2c.prod.commodity.type.ProductConstant;
 import com.uas.platform.b2c.prod.commodity.util.SheetUtil;
 import com.uas.platform.b2c.prod.product.common.service.CreateNumberService;
-import com.uas.platform.b2c.prod.store.service.StoreInService;
+import com.uas.platform.b2c.prod.product.common.service.impl.CreateNumberServiceImpl;
 import com.uas.platform.b2c.trade.order.service.PurchaseProductService;
 import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
@@ -75,20 +73,11 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
     @Autowired
     private ProductService productService;
 
-    @Autowired
-    private ProductPrivateDao productPrivateDao;
-
-    @Autowired
-    private ProductDao productDao;
-
     @Autowired
     private V_ProductPrivateDao v_productPrivateDao;
 
     @Autowired
-    private GoodsService goodsService;
-
-    @Autowired
-    private StoreInService storeInService;
+    private ProductPrivateService productPrivateService;
 
     /**
      * 物料服务访问路径
@@ -177,7 +166,7 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
                 }
                 // 保存临时表信息
             }
-            releaseProductByBatchDao.save(releaseProductByBatchArrayList);
+            releaseProductByBatchService.saveByJdbcTemplate(releaseProductByBatchArrayList);
             Long enUU = SystemSession.getUser().getEnterprise().getUu();
             // 验证数据信息是否重复
             releaseProductByBatchDao.callReleaseExistValidProcedure(batch, enUU);
@@ -191,6 +180,7 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
             Integer assignNumber = 0;
             // 去重后的数据
             List<ReleaseProductByBatch> uniqueBatchList = releaseProductByBatchDao.findByRelbatchidAndReleaseCodeNot(userUU, batch, failCode);
+            System.out.println("处理后数据大小： " + uniqueBatchList.size());
             if (!CollectionUtils.isEmpty(uniqueBatchList)) {
                 assignNumber = assignBatch(uniqueBatchList);
             }
@@ -350,6 +340,7 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
      */
     private Integer assignBatch(List<ReleaseProductByBatch> uniqueBatchList) {
         Set<Long> idSet = getProductIdSet(uniqueBatchList);
+        System.out.println("获取的物料id数量： " + idSet.size());
         if (CollectionUtils.isNotEmpty(idSet)) {
             HashMap<String, Object> params = new HashMap<>(5);
             ModelMap data = new ModelMap();
@@ -379,12 +370,18 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
         List<String> productCodeList = new ArrayList<>();
         Set<Long> idSet = new HashSet<>();
         List<ReleaseProductByBatch> batchList = new ArrayList<>();
+        String importNum = createNumberService.getTimeNumber("products", 8, uniqueBatchList.size());
+        if (StringUtils.isEmpty(importNum)) {
+            throw new IllegalOperatorException("生成批次号失败");
+        }
+        String time = importNum.substring(IntegerConstant.NO_SHORT, (IntegerConstant.TIME_LENGTH));
+        final Integer[] num = {Integer.valueOf(importNum.substring(IntegerConstant.TIME_LENGTH))};
         uniqueBatchList.forEach(batch -> {
             if (null != batch.getProductid()) {
                 idSet.add(batch.getProductid());
             } else {
                 if (StringUtilB2C.isEmpty(batch.getProductNum())) {
-                    String code = "PNUM" + StringUtilB2C.getRandomNumber(6);
+                    String code = "PNUM" + time + CreateNumberServiceImpl.formatIntToStr(++num[0], 8);
                     batch.setProductNum(code);
                 }
                 productCodeList.add(batch.getProductNum());
@@ -394,6 +391,7 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
         // 新增到物料库
         productService.saveByJdbcTemplate(batchList);
         List<com.uas.platform.b2c.prod.commodity.model.Product> productList = productService.findProductIdAndProdnumsByProdNums(productCodeList);
+        System.out.println("根据编号查询物料： " + productList.size());
         List<ProductPrivate> privateList = new ArrayList<>();
         productList.forEach(product -> {
             ProductPrivate productPrivate = new ProductPrivate(product.getId());
@@ -401,11 +399,10 @@ public class PurchaseProductServiceImpl implements PurchaseProductService {
             privateList.add(productPrivate);
             idSet.add(product.getId());
         });
-
         // 保存到私有库
         if (CollectionUtils.isNotEmpty(privateList)) {
-            productPrivateDao.save(privateList);
-            LOGGER.info("批量上传个人物料库，同步新增到商城私有库： " + privateList.size());
+            Integer count = productPrivateService.saveByJdbcTemplate(privateList);
+            LOGGER.info("批量上传个人物料库，同步新增到商城私有库： " + count);
         }
         return idSet;
     }

src/main/webapp/resources/js/common/services.js

@@ -160,7 +160,7 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
                     } else if (this.getRootPath().indexOf('b2c.usoftchina.com') > -1 || this.getRootPath().indexOf('mall.usoftchina.com') > -1) {
                         $rootScope.b2bUrl = 'https://b2b.usoftchina.com'
 					} else {
-                        $rootScope.b2bUrl = 'http://10.1.51.101:8090/platform-b2b'
+                        $rootScope.b2bUrl = 'http://10.1.51.125:8090/platform-b2b/'
 					}
 				}
 				return $rootScope.b2bUrl;

src/main/webapp/resources/js/usercenter/controllers/b2b/fa/arCheck.js

@@ -210,6 +210,9 @@
           BaseService.scrollBackToTop();
           // 获取当前用户是否为普通用户
           $rootScope.active = 'buyer_pay_center';
+
+          BaseService.scrollBackToTop();
+          // 获取当前用户是否为普通用户
           CurrentRole.isUser({}, {}, function (data) {
               $scope.isUser = data.isUser;
           });
@@ -217,9 +220,12 @@
           $scope.condition = {dateZone: 1};
           $scope.currency = Symbol.currency;//将币别转化为对应的符号
           $scope.active = 'all';
-
-
-
+          $scope.apCheckCondition = {
+              $open: false
+          }
+          var getService = function () {
+              return FaArCheck;
+          };
           /* 时间筛选初始化*/
           var fromDate = new Date();
           var toDate = new Date();
@@ -265,9 +271,8 @@
               $scope.tableParams.page(1);
               $scope.tableParams.reload();
           };
-          var getService = function () {
-              return FaArCheck;
-          };
+
+          $scope.ALLList = []
           //获取应收对账单全部
           $scope.tableParams = new ngTableParams({
               page: 1,
@@ -281,25 +286,28 @@
               getData: function ($defer, params) {
                   $scope.loading = true;
                   var pageParams = params.url();
-
                   pageParams.searchFilter = { // 筛选条件
-                      keyword: $scope.keyword,
                       fromDate: getDateTime($scope.condition.dateFrom),
-                      endDate: getDateTime($scope.condition.dateTo)
+                      endDate: getDateTime($scope.condition.dateTo),
+                      keyword: $scope.keyword
                   };
+                  pageParams.keyword = $scope.keyword;
                   if ($scope.active === 'all') {
                       pageParams.keyword = $scope.keyword
-                      var _fromDate =  $scope.thisMouthOut + '-01 00:00:00'
-                      var _d = new Date(_fromDate)
+                      var _fromDate = $scope.thisMouthOut + '-01 00:00:00'
+                      _fromDate = _fromDate.replace(/-/g,'/')
+                      var _d  = new Date(_fromDate)
                       _d.setDate(1)
                       _d.setMonth(_d.getMonth() + 1)
                       _d.setDate(_d.getDate() - 1)
                       var _endDate = _d.getFullYear() + '-' + (_d.getMonth() + 1) + '-' + _d.getDate() + ' 00:00:00'
+                      _endDate = _endDate.replace(/-/g, '/')
                       _endDate = new Date(_endDate).getTime()
+                      // _fromDate = _fromDate.replace(/-/g, '/')
                       _fromDate = new Date(_fromDate).getTime()
+
                       pageParams.searchFilter.fromDate =  _fromDate
                       pageParams.searchFilter.endDate = _endDate
-
                       FaApCheck.vendor(BaseService.parseParams(pageParams), function (page) {
                           $scope.loading = false;
                           page.content && page.content.forEach(function(list) {
@@ -317,14 +325,30 @@
                                   }
                               })
                               list.totalCount = _k
+
+                              var _MonthTodoCountArr = []
+                              list.thisMonthTodoCount && list.thisMonthTodoCount.forEach(function(item) {
+                                  if (item.amount > 0) {
+                                      _MonthTodoCountArr.push(item)
+                                  }
+                              })
+                              list.thisMonthTodoCount = _MonthTodoCountArr
+
+                              var _MonthDoneCountArr = []
+                              list.thisMonthDoneCount && list.thisMonthDoneCount.forEach(function(item) {
+                                  if (item.amount > 0) {
+                                      _MonthDoneCountArr.push(item)
+                                  }
+                              })
+                              list.thisMonthDoneCount = _MonthDoneCountArr
                           })
                           if (page) {
                               params.total(page.totalElement);
                               $defer.resolve(page.content);
                           }
-                          $scope.ALLList = page.content
                           $scope.infoCommon = page
                           $scope.infoCommon.all = page.content.length
+                          $scope.ALLList = page.content || []
                           $scope.totalCount = page.totalElement;
                       }, function (response) {
                           $scope.loading = false;
@@ -336,8 +360,7 @@
                           if (page) {
                               params.total(page.totalElement);
                               $scope.data = $defer.resolve(page.content);
-                              $scope.infoCommon = page
-                              $scope.infoCommon.all = page.content.length
+
                               $scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的条件
                           }
                       }, function (response) {
@@ -412,7 +435,8 @@
           };
 
           // 搜索框回车
-          $scope.onSearch = function () {
+          $scope.onSearch = function (keyword) {
+              $scope.keyword = keyword;
               $scope.tableParams.page(1);
               $scope.tableParams.reload();
           };
@@ -488,9 +512,8 @@
           $scope.goToMNs = function(item) {
               $scope.chooseItem = item;
               $scope.showNotCheck = true
-              // $scope.suuorname = item.myEnterprise.enName
-              // $scope.customerUU = item.myEnterprise.uu
               $scope.vendorUU = item.vendorEnterprise.uu
+              $scope.thisMouth = $scope.thisMouthOut
               this.searchOrder()
           }
 
@@ -530,8 +553,8 @@
               $scope.condition.venduuorname = $scope.vuuorname;
               if ($scope.condition.dateTo != null || $scope.keywordXls != null) {
 
-                  $scope.fromDate = $scope.apCheckCondition.dateFrom ? $scope.apCheckCondition.dateFrom.getTime() : null;
-                  $scope.endDate = $scope.apCheckCondition.dateTo ? $scope.apCheckCondition.dateTo.getTime() : null;
+                  // $scope.fromDate = $scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null;
+                  // $scope.endDate = $scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null;
                   $scope.searchKeyWord = {
                       receiveName: $scope.receiveName,
                       factory: $scope.factory,
@@ -541,12 +564,8 @@
                       vendorUU: $scope.vendorUU
                   }
                   $scope.exportKeywords = encodeURIComponent($scope.searchKeyWord);
-                  // $scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
-                  // $scope.endDateXls = angular.copy($scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null);//保存当前取值的截止日期
-                  // if (!$scope.suuorname) {
-                  //     toaster.pop('warning', '提示', '请先选择客户');
-                  //     document.getElementById('suuorname').focus();//光标默认在客户
-                  // } else {
+                  $scope.fromDate = $scope.apCheckCondition.dateFrom ? $scope.apCheckCondition.dateFrom.getTime() : null;
+                  $scope.endDate = $scope.apCheckCondition.dateTo ? $scope.apCheckCondition.dateTo.getTime() : null;
                   $scope.loading = true;
                   var _params = {}
                   if ($scope.apCheckCondition.$open) {
@@ -559,8 +578,7 @@
                           prodSpec: $scope.prodSpec,
                           taxRate: $scope.taxRate,
                           checkDate: $scope.thisMouth,
-                          // suuorname: $scope.suuorname,
-                          vendorUU: $scope.vendorUU,
+                          vendorUU: $scope.vendorUU
                       }
                   } else {
                       _params = {
@@ -570,32 +588,50 @@
                           prodSpec: $scope.prodSpec,
                           taxRate: $scope.taxRate,
                           checkDate: $scope.thisMouth,
-                          // suuorname: $scope.suuorname,
-                          vendorUU: $scope.vendorUU,
+                          vendorUU: $scope.vendorUU
                       }
                   }
                   FaApCheck.getAllArCheckByKeywords(_params, function (data) {
+                      $scope.checkMain = data;
                       if (data.details.length > 0) {
                           angular.forEach(data.details, function (item) {
                               item.$selected = true;
                           });
                           var _mouthArr = []
-                          data.thisMonthCount.forEach(function(item) {
+                          data.thisMonthCount && data.thisMonthCount.forEach(function(item) {
                               if (item.amount > 0) {
                                   _mouthArr.push(item)
                               }
                           })
                           data.thisMonthCount = _mouthArr
                           var _totalArr = []
-                          data.totalCount.forEach(function(item) {
+                          data.totalCount && data.totalCount.forEach(function(item) {
                               if (item.amount > 0) {
                                   _totalArr.push(item)
                               }
                           })
                           data.totalCount = _totalArr
+
+                          var _MonthTodoCountArr = []
+                          data.thisMonthTodoCount && data.thisMonthTodoCount.forEach(function(item) {
+                              if (item.amount > 0) {
+                                  _MonthTodoCountArr.push(item)
+                              }
+                          })
+                          data.thisMonthTodoCount = _MonthTodoCountArr
+
+                          var _MonthDoneCountArr = []
+                          data.thisMonthDoneCount && data.thisMonthDoneCount.forEach(function(item) {
+                              if (item.amount > 0) {
+                                  _MonthDoneCountArr.push(item)
+                              }
+                          })
+                          data.thisMonthDoneCount = _MonthDoneCountArr
+
                           $scope.dataInfo = data
                           $scope.data = data.details;
                           $scope.checkboxes.checked = true;
+                          // $scope.suuorname = data.vendorName
                           $scope.getTotalMoney();
                       } else {
                           toaster.pop('info', '提示', '当前没有需要对账记录');
@@ -640,7 +676,7 @@
               if (angular.isDefined($scope.taxRate)) {
                   url = url + '&taxRate=' + $scope.taxRate;
               }
-              window.location.href = url;
+              window.open(url);
           }
 
           /**
@@ -657,7 +693,6 @@
               $scope.filteredData = $filter('filter')($scope.data, $scope.condition.prodtitle || $scope.condition.uuorname || $scope.condition.venduuorname || $scope.condition.prodspec || $scope.condition.factory);
               // var dateFrom = $scope.condition.dateFrom;
               // var dateTo = $scope.condition.dateTo;
-
               angular.forEach($scope.filteredData, function (item) {
                   // if ((item.pidate >= dateFrom || dateFrom == '') && (item.pidate < dateTo || dateTo == '')) {
                   item.$selected = $scope.checkboxes.checked;
@@ -670,12 +705,12 @@
           $scope.getTotalMoney = function () {
               $scope.totalMoney = 0;
               angular.forEach($scope.data, function (check) {
-                  if (check.$selected) {
+                  // if (check.$selected) {
                       var price = DecimalNumber.accMul((check.thischeckqty || 0), (check.orderprice || 0));
                       $scope.totalMoney += Math.round(price * 100) / 100;
-                  } else {
-                      $scope.totalMoney += 0;
-                  }
+                  // } else {
+                  //     $scope.totalMoney += 0;
+                  // }
               });
 
           }
@@ -683,7 +718,6 @@
           // 点击其中一个明细的复选框
           $scope.checkOne = function (check) {
               check.$selected = !check.$selected
-
               $scope.Checkall()
           };
           $scope.stopPrevent = function(e) {
@@ -703,6 +737,7 @@
               });
               $scope.checkboxes.checked = result;
           }
+
           $scope.haveSelected = false;
 
           //生成应收对账单
@@ -872,7 +907,7 @@
                       FaApCheck.saveApCheck({}, $scope.apCheck, function (data) {
                           $scope.loading = false;
                           toaster.pop('success', '成功', '生成应收对账成功');
-                          $state.go('fa_apCheck_detail', {id: data.id}, {reload: true});
+                          $state.go('fa.apCheck_detail', {id: data.id}, {reload: true});
                       }, function (response) {
                           $scope.loading = false;
                           toaster.pop('error', '生成对账单失败', response.data);
@@ -884,14 +919,12 @@
               if ($scope.sameCust && $scope.validQty) {
                   $scope.saveApCheck();
               }
-          }
 
+
+          }
           // 新增
           $scope.MouthOutShow = true
           $scope.MouthinShow = true
-          $scope.apCheckCondition = {
-              $open: false
-          }
           $scope.apCheckopenFilterDatePicker = function ($event, item, openParam) {
               $event.preventDefault();
               $event.stopPropagation();
@@ -902,7 +935,10 @@
           };
           $scope.addMouth = function(val) {
               var _sp = new Date()
-              var _time = new Date($scope.thisMouth)
+              var _time1 = $scope.thisMouth + '-01'
+              _time1 = _time1.replace(/-/g, '/')
+              var _time  = new Date(_time1)
+
               _time.setMonth(_time.getMonth() + val)
               _time.setDate(1)
               _time.setMonth(_time.getMonth() + 1)
@@ -914,12 +950,16 @@
               }
               $scope.thisMouth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
               $scope.apCheckCondition.$open = false
-              $scope.searchOrder()
+              // $scope.searchOrder()
           }
 
           $scope.addMouthOut = function(val) {
               var _sp = new Date()
-              var _time = new Date($scope.thisMouthOut)
+              // var _time = new Date($scope.thisMouthOut)
+              var _time1 = $scope.thisMouthOut + '-01'
+              _time1 = _time1.replace(/-/g, '/')
+              var _time  = new Date(_time1)
+              // var _time  = new Date($scope.thisMouthOut.replace(/-/g,'/'))
               _time.setMonth(_time.getMonth() + val)
               _time.setDate(1)
               _time.setMonth(_time.getMonth() + 1)
@@ -930,8 +970,8 @@
                   $scope.MouthOutShow = true
               }
               $scope.thisMouthOut = _time.getFullYear() + '-' + (_time.getMonth() + 1)
-              $scope.tableParams.page(1);
-              $scope.tableParams.reload();
+              // $scope.tableParams.page(1);
+              // $scope.tableParams.reload();
           }
 
           $scope.hideshowNotCheck = function() {
@@ -940,7 +980,9 @@
 
           $scope.$watch('thisMouthOut', function(newVal, oldVal) {
               var _fromDate = new Date()
+
               var _d = new Date(_fromDate)
+              // var _d  = new Date(_fromDate.replace(/-/g,'/'))
               _d.setDate(1)
               _d.setMonth(_d.getMonth() + 1)
               _d.setDate(_d.getDate() - 1)
@@ -952,7 +994,9 @@
                   return
               }
               if (newVal !== oldVal) {
-                  var _d = new Date(newVal)
+                  // var _d = new Date(newVal)
+                  var _newVal = newVal.replace(/-/g,'/')
+                  var _d  = new Date(_newVal)
                   _d.setDate(1)
                   _d.setMonth(_d.getMonth() + 1)
                   _d.setDate(_d.getDate() - 1)
@@ -969,6 +1013,7 @@
           $scope.$watch('thisMouth', function(newVal, oldVal) {
               var _fromDate = new Date()
               var _d = new Date(_fromDate)
+              // var _d  = new Date(_fromDate.replace(/-/g,'/'))
               _d.setDate(1)
               _d.setMonth(_d.getMonth() + 1)
               _d.setDate(_d.getDate() - 1)
@@ -980,7 +1025,9 @@
                   return
               }
               if (newVal !== oldVal) {
-                  var _d = new Date(newVal)
+                  // var _d = new Date(newVal)
+                  var _newVal = newVal.replace(/-/g,'/')
+                  var _d  = new Date(_newVal)
                   _d.setDate(1)
                   _d.setMonth(_d.getMonth() + 1)
                   _d.setDate(_d.getDate() - 1)

src/main/webapp/resources/js/vendor/controllers/b2b/apCheck.js

@@ -4,7 +4,7 @@ define(['app/app'], function (app) {
   app.register.controller('PurchaseApCheckCtrl', ['$rootScope', '$scope', 'B2bFaApCheck', 'BaseService', 'ngTableParams', 'toaster', 'B2bReportService', 'Symbol', 'B2bCurrentRole',  'B2bDecimalNumber', '$filter', '$state',function ($rootScope, $scope, FaApCheck, BaseService, ngTableParams, toaster, ReportService, Symbol, CurrentRole, DecimalNumber, $filter, $state) {
       BaseService.scrollBackToTop();
       // 获取当前用户是否为普通用户
-      $rootScope.active = 'vendor_pay_center';
+      $rootScope.active = 'vendor_pay_center'
       CurrentRole.isUser({}, {}, function (data) {
           $scope.isUser = data.isUser;
       });
@@ -12,9 +12,9 @@ define(['app/app'], function (app) {
       $scope.condition = {dateZone: 1};
       $scope.currency = Symbol.currency;//将币别转化为对应的符号
       $scope.active = 'all';
-
-
-
+      $scope.apCheckCondition = {
+          $open: false
+      }
       /* 时间筛选初始化*/
       var fromDate = new Date();
       var toDate = new Date();
@@ -74,25 +74,28 @@ define(['app/app'], function (app) {
           getData: function ($defer, params) {
               $scope.loading = true;
               var pageParams = params.url();
-
               pageParams.searchFilter = { // 筛选条件
-                  keyword: $scope.keyword,
                   fromDate: getDateTime($scope.condition.dateFrom),
-                  endDate: getDateTime($scope.condition.dateTo)
+                  endDate: getDateTime($scope.condition.dateTo),
+                  keyword: $scope.keyword
               };
+              pageParams.keyword = $scope.keyword;
               if ($scope.active === 'all') {
                   pageParams.keyword = $scope.keyword
                   var _fromDate =  $scope.thisMouthOut + '-01 00:00:00'
-                  var _d = new Date(_fromDate)
+                  // var _d = new Date(_fromDate)
+                  _fromDate = _fromDate.replace(/-/g,'/')
+                  var _d  = new Date(_fromDate)
                   _d.setDate(1)
                   _d.setMonth(_d.getMonth() + 1)
                   _d.setDate(_d.getDate() - 1)
                   var _endDate = _d.getFullYear() + '-' + (_d.getMonth() + 1) + '-' + _d.getDate() + ' 00:00:00'
+                  _endDate = _endDate.replace(/-/g,'/')
+                  _fromDate = _fromDate.replace(/-/g,'/')
                   _endDate = new Date(_endDate).getTime()
                   _fromDate = new Date(_fromDate).getTime()
                   pageParams.searchFilter.fromDate =  _fromDate
                   pageParams.searchFilter.endDate = _endDate
-
                   FaApCheck.customer(BaseService.parseParams(pageParams), function (page) {
                       $scope.loading = false;
                       page.content && page.content.forEach(function(list) {
@@ -110,14 +113,30 @@ define(['app/app'], function (app) {
                               }
                           })
                           list.totalCount = _k
+
+                          var _MonthTodoCountArr = []
+                          list.thisMonthTodoCount && list.thisMonthTodoCount.forEach(function(item) {
+                              if (item.amount > 0) {
+                                  _MonthTodoCountArr.push(item)
+                              }
+                          })
+                          list.thisMonthTodoCount = _MonthTodoCountArr
+
+                          var _MonthDoneCountArr = []
+                          list.thisMonthDoneCount && list.thisMonthDoneCount.forEach(function(item) {
+                              if (item.amount > 0) {
+                                  _MonthDoneCountArr.push(item)
+                              }
+                          })
+                          list.thisMonthDoneCount = _MonthDoneCountArr
                       })
                       if (page) {
                           params.total(page.totalElement);
                           $defer.resolve(page.content);
                       }
-                      $scope.ALLList = page.content
                       $scope.infoCommon = page
-                      $scope.infoCommon.all = page.content && page.content.length
+                      $scope.infoCommon.all = page.content.length
+                      $scope.ALLList = page.content
                       $scope.totalCount = page.totalElement;
                   }, function (response) {
                       $scope.loading = false;
@@ -129,8 +148,7 @@ define(['app/app'], function (app) {
                       if (page) {
                           params.total(page.totalElement);
                           $scope.data = $defer.resolve(page.content);
-                          $scope.infoCommon = page
-                          $scope.infoCommon.all = page.content && page.content.length
+
                           $scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的条件
                       }
                   }, function (response) {
@@ -205,7 +223,8 @@ define(['app/app'], function (app) {
       };
 
       // 搜索框回车
-      $scope.onSearch = function () {
+      $scope.onSearch = function (keyword) {
+          $scope.keyword = keyword;
           $scope.tableParams.page(1);
           $scope.tableParams.reload();
       };
@@ -283,6 +302,7 @@ define(['app/app'], function (app) {
           $scope.showNotCheck = true
           $scope.suuorname = item.myEnterprise.enName
           $scope.customerUU = item.myEnterprise.uu
+          $scope.thisMouth = $scope.thisMouthOut
           this.searchOrder()
       }
 
@@ -322,15 +342,16 @@ define(['app/app'], function (app) {
           $scope.condition.venduuorname = $scope.vuuorname;
           if ($scope.condition.dateTo != null || $scope.keywordXls != null) {
 
-              $scope.fromDate = $scope.apCheckCondition.dateFrom ? $scope.apCheckCondition.dateFrom.getTime() : null;
-              $scope.endDate = $scope.apCheckCondition.dateTo ? $scope.apCheckCondition.dateTo.getTime() : null;
+              // $scope.fromDate = $scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null;
+              // $scope.endDate = $scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null;
               $scope.searchKeyWord = {
                   receiveName: $scope.receiveName,
                   factory: $scope.factory,
                   prodTitle: $scope.prodTitle,
                   prodSpec: $scope.prodSpec,
                   taxRate: $scope.taxRate,
-                  suuorname: $scope.suuorname
+                  suuorname: $scope.suuorname,
+                  customerUU: $scope.customerUU
               }
               $scope.exportKeywords = encodeURIComponent($scope.searchKeyWord);
               // $scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
@@ -339,6 +360,8 @@ define(['app/app'], function (app) {
               //     toaster.pop('warning', '提示', '请先选择客户');
               //     document.getElementById('suuorname').focus();//光标默认在客户
               // } else {
+              $scope.fromDate = $scope.apCheckCondition.dateFrom ? $scope.apCheckCondition.dateFrom.getTime() : null;
+              $scope.endDate = $scope.apCheckCondition.dateTo ? $scope.apCheckCondition.dateTo.getTime() : null;
               $scope.loading = true;
               var _params = {}
               if ($scope.apCheckCondition.$open) {
@@ -367,24 +390,42 @@ define(['app/app'], function (app) {
                   }
               }
               FaApCheck.getAllByKeywords(_params, function (data) {
+                  $scope.checkMain = data;
                   if (data.details.length > 0) {
                       angular.forEach(data.details, function (item) {
                           item.$selected = true;
                       });
                       var _mouthArr = []
-                      data.thisMonthCount.forEach(function(item) {
+                      data.thisMonthCount && data.thisMonthCount.forEach(function(item) {
                           if (item.amount > 0) {
                               _mouthArr.push(item)
                           }
                       })
                       data.thisMonthCount = _mouthArr
                       var _totalArr = []
-                      data.totalCount.forEach(function(item) {
+                      data.totalCount && data.totalCount.forEach(function(item) {
                           if (item.amount > 0) {
                               _totalArr.push(item)
                           }
                       })
                       data.totalCount = _totalArr
+
+                      var _MonthTodoCountArr = []
+                      data.thisMonthTodoCount && data.thisMonthTodoCount.forEach(function(item) {
+                          if (item.amount > 0) {
+                              _MonthTodoCountArr.push(item)
+                          }
+                      })
+                      data.thisMonthTodoCount = _MonthTodoCountArr
+
+                      var _MonthDoneCountArr = []
+                      data.thisMonthDoneCount && data.thisMonthDoneCount.forEach(function(item) {
+                          if (item.amount > 0) {
+                              _MonthDoneCountArr.push(item)
+                          }
+                      })
+                      data.thisMonthDoneCount = _MonthDoneCountArr
+
                       $scope.dataInfo = data
                       $scope.data = data.details;
                       $scope.checkboxes.checked = true;
@@ -410,8 +451,8 @@ define(['app/app'], function (app) {
           if (angular.isDefined($scope.thisMouth)) {
               url = url + '&checkDate=' + $scope.thisMouth;
           }
-          if (angular.isDefined($scope.receiveName)) {
-              url = url + '&receiveName=' + $scope.receiveName;
+          if (angular.isDefined($scope.customerUU)) {
+              url = url + '&customerUU=' + $scope.customerUU;
           }
           if (angular.isDefined($scope.factory)) {
               url = url + '&factory=' + $scope.factory;
@@ -422,9 +463,6 @@ define(['app/app'], function (app) {
           if (angular.isDefined($scope.prodSpec)) {
               url = url + '&prodSpec=' + $scope.prodSpec;
           }
-          if (angular.isDefined($scope.suuorname)) {
-              url = url + '&suuorname=' + $scope.suuorname;
-          }
           if (angular.isDefined($scope.taxRate)) {
               url = url + '&taxRate=' + $scope.taxRate;
           }
@@ -445,10 +483,11 @@ define(['app/app'], function (app) {
           $scope.filteredData = $filter('filter')($scope.data, $scope.condition.prodtitle || $scope.condition.uuorname || $scope.condition.venduuorname || $scope.condition.prodspec || $scope.condition.factory);
           // var dateFrom = $scope.condition.dateFrom;
           // var dateTo = $scope.condition.dateTo;
-
           angular.forEach($scope.filteredData, function (item) {
-              // if ((item.pidate >= dateFrom || dateFrom == '') && (item.pidate < dateTo || dateTo == '')) {
-              item.$selected = $scope.checkboxes.checked;
+              if (item.haveChecked !== 1) {
+                  // if ((item.pidate >= dateFrom || dateFrom == '') && (item.pidate < dateTo || dateTo == '')) {
+                  item.$selected = $scope.checkboxes.checked;
+              }
               // }
           });
           $scope.getTotalMoney();
@@ -458,20 +497,22 @@ define(['app/app'], function (app) {
       $scope.getTotalMoney = function () {
           $scope.totalMoney = 0;
           angular.forEach($scope.data, function (check) {
-              if (check.$selected) {
+              // if (check.$selected) {
                   var price = DecimalNumber.accMul((check.thischeckqty || 0), (check.orderprice || 0));
                   $scope.totalMoney += Math.round(price * 100) / 100;
-              } else {
-                  $scope.totalMoney += 0;
-              }
+              // } else {
+              //     $scope.totalMoney += 0;
+              // }
           });
 
       }
 
       // 点击其中一个明细的复选框
       $scope.checkOne = function (check) {
+          if (check.haveChecked === 1) {
+              return
+          }
           check.$selected = !check.$selected
-
           $scope.Checkall()
       };
       $scope.stopPrevent = function(e) {
@@ -491,6 +532,7 @@ define(['app/app'], function (app) {
           });
           $scope.checkboxes.checked = result;
       }
+
       $scope.haveSelected = false;
 
       //生成应收对账单
@@ -546,7 +588,8 @@ define(['app/app'], function (app) {
                   taxrate: '',
                   sendcode: '',
                   whname: '',
-                  custUserUU: ''
+                  custUserUU: '',
+                  sourceDate: ''
               };
 
               //应收对账单明细行来源表信息
@@ -558,7 +601,7 @@ define(['app/app'], function (app) {
 
               //此次对账后新的已转数
               $scope.newYCheckQty = 0;
-              if (check.$selected == true) {
+              if (check.$selected == true  && !check.haveChecked) {
                   $scope.apCheck.custName = check.custname;
                   $scope.apCheck.enUu = check.enuu;
                   $scope.apCheck.checkAmount += (check.thischeckqty || 0) * (check.orderprice || 0);
@@ -612,10 +655,10 @@ define(['app/app'], function (app) {
                   }
 
                   //获取筛选时间的开始时间为对账的开始时间
-                  $scope.apCheck.beginDate = $scope.fromDate;
+                  // $scope.apCheck.beginDate = $scope.fromDate;
 
                   //获取筛选的截止时间为对账的截止时间
-                  $scope.apCheck.endDate = $scope.endDate;
+                  // $scope.apCheck.endDate = $scope.endDate;
 
                   //应收对账单明细行数据
                   $scope.item.orderCode = check.ordercode;
@@ -639,7 +682,7 @@ define(['app/app'], function (app) {
                   $scope.item.sendcode = check.sendcode;
                   $scope.item.whname = check.whname;
                   $scope.item.custUserUU = check.custuseruu;
-
+                  $scope.item.sourceDate = check.pidate
                   //来源表相关信息
                   $scope.sourceInfo.sourceid = check.sourceid;
                   $scope.sourceInfo.sourcetable = check.sourcetable;
@@ -650,7 +693,25 @@ define(['app/app'], function (app) {
                   $scope.haveSelected = true;
               }
           });
+          if ($scope.apCheckCondition.$open) {
+              $scope.fromDate = $scope.apCheckCondition.dateFrom ? $scope.apCheckCondition.dateFrom.getTime() : null;
+              $scope.endDate = $scope.apCheckCondition.dateTo ? $scope.apCheckCondition.dateTo.getTime() : null;
+          } else {
+              var _isShowApcheckList = $scope.thisMouth + '-01'
+              var _time1 = _isShowApcheckList
+              _time1 = _time1.replace(/-/g, '/')
+              var _d = new Date(_time1)
+              _d.setDate(1)
+              _d.setMonth(_d.getMonth() + 1)
+              _d.setDate(_d.getDate() - 1)
 
+              // 获取筛选时间的开始时间为对账的开始时间
+              var _time2 = _isShowApcheckList
+              _time2 = _time2.replace(/-/g, '/')
+              $scope.fromDate = new Date(_time2).getTime()
+              // 获取筛选的截止时间为对账的截止时间
+              $scope.endDate = _d.getTime()
+          }
           //保存生成的应收对账单
           $scope.saveApCheck = function () {
               if ($scope.apCheck.items.length == 0) {
@@ -660,7 +721,7 @@ define(['app/app'], function (app) {
                   FaApCheck.saveApCheck({}, $scope.apCheck, function (data) {
                       $scope.loading = false;
                       toaster.pop('success', '成功', '生成应收对账成功');
-                      $state.go('fa_apCheck_detail', {id: data.id}, {reload: true});
+                      $state.go('fa.apCheck_detail', {id: data.id}, {reload: true});
                   }, function (response) {
                       $scope.loading = false;
                       toaster.pop('error', '生成对账单失败', response.data);
@@ -672,14 +733,12 @@ define(['app/app'], function (app) {
           if ($scope.sameCust && $scope.validQty) {
               $scope.saveApCheck();
           }
-      }
 
+
+      }
       // 新增
       $scope.MouthOutShow = true
       $scope.MouthinShow = true
-      $scope.apCheckCondition = {
-          $open: false
-      }
       $scope.apCheckopenFilterDatePicker = function ($event, item, openParam) {
           $event.preventDefault();
           $event.stopPropagation();
@@ -690,7 +749,10 @@ define(['app/app'], function (app) {
       };
       $scope.addMouth = function(val) {
           var _sp = new Date()
-          var _time = new Date($scope.thisMouth)
+          // var _time = new Date($scope.thisMouth)
+          var _time = $scope.thisMouth + '-01'
+          _time = _time.replace(/-/g,'/')
+          _time  = new Date(_time)
           _time.setMonth(_time.getMonth() + val)
           _time.setDate(1)
           _time.setMonth(_time.getMonth() + 1)
@@ -702,12 +764,16 @@ define(['app/app'], function (app) {
           }
           $scope.thisMouth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
           $scope.apCheckCondition.$open = false
-          $scope.searchOrder()
+          // $scope.searchOrder()
       }
 
       $scope.addMouthOut = function(val) {
           var _sp = new Date()
-          var _time = new Date($scope.thisMouthOut)
+          var _time = $scope.thisMouthOut + '-01'
+          _time = _time.replace(/-/g,'/')
+          _time  = new Date(_time)
+          // var _time = new Date($scope.thisMouthOut)
+          // var _time  = new Date($scope.thisMouthOut.replace(/-/g,'/'))
           _time.setMonth(_time.getMonth() + val)
           _time.setDate(1)
           _time.setMonth(_time.getMonth() + 1)
@@ -718,8 +784,8 @@ define(['app/app'], function (app) {
               $scope.MouthOutShow = true
           }
           $scope.thisMouthOut = _time.getFullYear() + '-' + (_time.getMonth() + 1)
-          $scope.tableParams.page(1);
-          $scope.tableParams.reload();
+          // $scope.tableParams.page(1);
+          // $scope.tableParams.reload();
       }
 
       $scope.hideshowNotCheck = function() {
@@ -729,6 +795,7 @@ define(['app/app'], function (app) {
       $scope.$watch('thisMouthOut', function(newVal, oldVal) {
           var _fromDate = new Date()
           var _d = new Date(_fromDate)
+          // var _d  = new Date(_fromDate.replace(/-/g,'/'))
           _d.setDate(1)
           _d.setMonth(_d.getMonth() + 1)
           _d.setDate(_d.getDate() - 1)
@@ -740,7 +807,11 @@ define(['app/app'], function (app) {
               return
           }
           if (newVal !== oldVal) {
-              var _d = new Date(newVal)
+              // var _d = new Date(newVal)
+              var _d = newVal + '-01'
+              _d = _d.replace(/-/g,'/')
+              _d  = new Date(_d)
+              // var _d  = new Date(newVal.replace(/-/g,'/'))
               _d.setDate(1)
               _d.setMonth(_d.getMonth() + 1)
               _d.setDate(_d.getDate() - 1)
@@ -757,6 +828,7 @@ define(['app/app'], function (app) {
       $scope.$watch('thisMouth', function(newVal, oldVal) {
           var _fromDate = new Date()
           var _d = new Date(_fromDate)
+          // var _d  = new Date(_fromDate.replace(/-/g,'/'))
           _d.setDate(1)
           _d.setMonth(_d.getMonth() + 1)
           _d.setDate(_d.getDate() - 1)
@@ -768,7 +840,11 @@ define(['app/app'], function (app) {
               return
           }
           if (newVal !== oldVal) {
-              var _d = new Date(newVal)
+              // var _d = new Date(newVal)
+              var _d = newVal + '-01'
+              _d = _d.replace(/-/g,'/')
+              _d  = new Date(_d)
+              // var _d  = new Date(newVal.replace(/-/g,'/'))
               _d.setDate(1)
               _d.setMonth(_d.getMonth() + 1)
               _d.setDate(_d.getDate() - 1)
@@ -783,7 +859,6 @@ define(['app/app'], function (app) {
       })
 
 
-
       /**
      * 将日期转化为整数日期
      */

src/main/webapp/resources/js/vendor/controllers/forstore/seek_purchase_ctrl.js

@@ -8,6 +8,7 @@ define(['app/app'], function (app) {
           $rootScope.active = 'vendor_seek_purchase';
           $scope.storeType = 'seekPurchase';
           $scope.seekPurchaseRate = {};
+          $scope.inquiryItem = {};
           $scope.sayType = 'current'; // 报价类型,current为当前，replace为替代料
             var _formatDate = function (date, fmt) {
                 if (!date) {
@@ -51,21 +52,22 @@ define(['app/app'], function (app) {
 
           seekPurchase.getSeekUrl({}, function(data) {
             var seekUrl = data.url;
-          var initInquiryItem = function () {
-            $scope.validSayPrice = {
-              leadtime: false,
-              repliesPrice: false,
-              repliesLapQty: false,
-              replaceBrand: false,
-              replaceCmpCode: false,
-              replaceSpec: true
-            };
-            $scope.inquiryItem = {};
-          }
-          init();
-          initInquiryItem();
+              var initInquiryItem = function () {
+                $scope.validSayPrice = {
+                  leadtime: false,
+                  taxrate: false,
+                  repliesPrice: false,
+                  repliesLapQty: false,
+                  replaceBrand: false,
+                  replaceCmpCode: false,
+                  replaceSpec: true
+                };
+              }
+              init();
+              initInquiryItem();
 
             $scope.setSayType = function (type) {
+                initInquiryItem();
               if (type == 'current') {
                 delete $scope.inquiryItem.replaceBrand;
                 delete $scope.inquiryItem.replaceCmpCode;
@@ -73,6 +75,7 @@ define(['app/app'], function (app) {
                 // $scope.inquiryItem.isReplace = null;
               }
               $scope.inquiryItem.leadtime = '';
+              $scope.inquiryItem.taxrate = '';
               for (var i = 0; i < $scope.seekCurrency.length; i++) {
                 $scope.seekCurrency[i] = 'RMB';
               }
@@ -297,6 +300,7 @@ define(['app/app'], function (app) {
                   toaster.pop('success', '感谢您参与报价，敬请期待回复');
                   $scope.isShowSayPriceBox = false;
                   $scope.seekPurchaseTableParams.reload();
+                  initInquiryItem()
                 }, function (response) {
                   toaster.pop('error', '请勿重复报价或报价自己的求购');
                 });
@@ -305,6 +309,7 @@ define(['app/app'], function (app) {
                   toaster.pop('success', '感谢您参与报价，敬请期待回复');
                   $scope.isShowSayPriceBox = false;
                   $scope.seekPurchaseTableParams.reload();
+                  initInquiryItem()
                 }, function (response) {
                   toaster.pop('error', '请勿重复报价或报价自己的求购');
                 });
@@ -437,25 +442,29 @@ define(['app/app'], function (app) {
             if (!$scope.inquiryItem.leadtime || $scope.inquiryItem.leadtime < 1 || $scope.inquiryItem.leadtime >= 1000 || $scope.inquiryItem.leadtime.toString().indexOf('.') !== -1) {
               $scope.validSayPrice.leadtime = false;
               toaster.pop('error', '交期请填写1-999之间的正整数');
+                $scope.inquiryItem.leadtime = '';
             } else {
               $scope.validSayPrice.leadtime = true;
+                $scope.inquiryItem.leadtime = Number($scope.inquiryItem.leadtime)
             }
           };
 
-              $scope.onTaxrateInput = function () {
-                  var time = $scope.inquiryItem.taxrate.replace(/[^\-?\d.]/g, '');
-                  if (time.length > 2) {
-                      $scope.inquiryItem.taxrate = Number(time.substring(0, 2));
-                  }
+          $scope.onTaxrateInput = function () {
+              var time = $scope.inquiryItem.taxrate.replace(/[^\-?\d.]/g, '');
+              if (time.length > 2) {
+                  $scope.inquiryItem.taxrate = Number(time.substring(0, 2));
               }
-              $scope.onTaxrateBlur = function () {
-                  if ($scope.inquiryItem.taxrate < 0 || $scope.inquiryItem.taxrate >= 100 || $scope.inquiryItem.taxrate.toString().indexOf('.') !== -1) {
-                      $scope.validSayPrice.taxrate = false;
-                      toaster.pop('error', '税率请填写0-99之间的正整数');
-                  } else {
-                      $scope.validSayPrice.taxrate = true;
-                  }
-              };
+          }
+          $scope.onTaxrateBlur = function () {
+              if ($scope.inquiryItem.taxrate < 0 || $scope.inquiryItem.taxrate >= 100 || $scope.inquiryItem.taxrate.toString().indexOf('.') !== -1) {
+                  $scope.validSayPrice.taxrate = false;
+                  toaster.pop('error', '税率请填写0-99之间的正整数');
+                  $scope.inquiryItem.taxrate = '';
+              } else {
+                  $scope.validSayPrice.taxrate = true;
+                  $scope.inquiryItem.taxrate = Number($scope.inquiryItem.taxrate)
+              }
+          };
 
             $scope.onReplaceBrandBlur = function () {
               if (!$scope.inquiryItem.replaceBrand || $scope.inquiryItem.replaceBrand.length == 0) {
@@ -498,6 +507,7 @@ define(['app/app'], function (app) {
               $scope.validSayPrice.repliesLapQty = false;
             } else {
               $scope.validSayPrice.repliesLapQty = true;
+              $scope.inquiryItem.replies[index].lapQty = Number($scope.inquiryItem.replies[index].lapQty)
             }
           }
           $scope.onReplyLapQtyInput = function (index) {
@@ -546,6 +556,7 @@ define(['app/app'], function (app) {
               $scope.validSayPrice.repliesPrice = false;
             } else {
               $scope.validSayPrice.repliesPrice = true;
+                $scope.inquiryItem.replies[index].price = Number(price)
             }
           }
 /*

src/main/webapp/resources/view/sso/staffManagement.html

@@ -940,7 +940,7 @@
                              全选</th>-->
                         <!--<th width="143">UU账号</th>-->
                         <th width="101">姓名</th>
-                        <th width="67">性别</th>
+                        <!--<th width="67">性别</th>-->
                         <th width="133">手机</th>
                         <th width="207">邮箱</th>
                         <th width="188">商城角色</th>
@@ -960,12 +960,12 @@
                         <td>
                             <input type="text" ng-model="newUser.userName" required placeholder="用户名">
                         </td>
-                        <td>
-                            <select ng-model="newUser.userSex" ng-init="newUser.userSex='M'" >
-                                <option value="M">男</option>
-                                <option value="F">女</option>
-                            </select>
-                        </td>
+                        <!--<td>-->
+                            <!--<select ng-model="newUser.userSex" ng-init="newUser.userSex='M'" >-->
+                                <!--<option value="M">男</option>-->
+                                <!--<option value="F">女</option>-->
+                            <!--</select>-->
+                        <!--</td>-->
                         <td ng-class="{'has-error': userTelError, 'has-success': userTelSuccess}">
                             <input ng-model="newUser.userTel"
                                    ng-blur="telValid(newUser.userTel)" required name="newUserTel"
@@ -980,6 +980,9 @@
                         <td class="role-tag-area">
                             <span class="role-tag bgcolor-5">普</span>
                         </td>
+                        <td class="role-tag-area">
+                            <!--<span class="role-tag bgcolor-5">普</span>-->
+                        </td>
                         <td class="submit-area">
                             <span ng-click="setAddingUser(false)" >取消</span>
                             <span ng-click="addUser(newUser)">确定</span>
@@ -994,7 +997,7 @@
                          </td>-->
                         <!--<td>{{user.userUU}}</td>-->
                         <td>{{user.userName}}</td>
-                        <td>{{user.userSex != null ? (user.userSex == 'M' || user.userSex == '男' ? '男' : '女') : '-'}}</td>
+                        <!--<td>{{user.userSex != null ? (user.userSex == 'M' || user.userSex == '男' ? '男' : '女') : '-'}}</td>-->
                         <td>{{user.userTel}}</td>
                         <td>{{user.userEmail}}</td>
                         <td class="role-tag-area detail-role-tag">

src/main/webapp/resources/view/usercenter/b2b/fa/arCheck.html

@@ -509,6 +509,7 @@
       <li class="down-purchase" style="margin-right: 0;min-width: 80px"  ng-hide="active === 'all'">
         <a href="#" style="min-width: 80px" ng-click="exportXls()" target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</a>
       </li>
+      <li style="float: right;font-size: 14px;cursor: pointer;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()"><img src="/static/img/vendor/images/backIcon.png" width="20"/>返回</li>
       <!--<li class="down-purchase" style="margin-right: 0;min-width: 80px" ng-hide="showNotCheck">-->
       <!--<a class="text-simple append" style="min-width: 80px" ui-sref="fa_apCheckList" title="新增对账单">-->
       <!--<i class="fa fa-plus-square fa-fw"></i>新增对账单-->
@@ -517,16 +518,16 @@
 
     </ul>
   </div>
-  <div class="com_tab tab_top" style="margin-bottom: 0px">
-    <ul>
-      <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 未对账</a></li>
+  <!--<div class="com_tab tab_top" style="margin-bottom: 0px">-->
+    <!--<ul>-->
+      <!--<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 未对账</a></li>-->
       <!--<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待确认(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</a></li>-->
-      <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已对账</a></li>
+      <!--<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已对账</a></li>-->
       <!--(<em ng-class="{'color-black': !unread.cancelled }" ng-bind="unread.cancelled || 0"></em>)-->
       <!--<li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已作废</a></li>-->
-      <li style="float: right;font-size: 14px;cursor: pointer;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()"><img src="/static/img/vendor/images/backIcon.png" width="20"/>返回</li>
-    </ul>
-  </div>
+      <!--<li style="float: right;font-size: 14px;cursor: pointer;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()"><img src="/static/img/vendor/images/backIcon.png" width="20"/>返回</li>-->
+    <!--</ul>-->
+  <!--</div>-->
   <div class="screen check-filter" ng-show="!showNotCheck">
     <div class="radio-block date-radio" ng-show="active !== 'all'" style="width: 33%">
       时间：
@@ -711,10 +712,12 @@
 
         <thead ng-show="active === 'all'">
         <tr class="header">
-          <th width="313">应付供应商名称</th>
-          <th width="250">本月应付</th>
-          <th width="250">应付总额</th>
-          <th width="160">操作</th>
+          <th width="200">应付供应商名称</th>
+          <th width="170">本月应付</th>
+          <th width="170">本月未对</th>
+          <th width="170">本月已对</th>
+          <th width="170">应付总额</th>
+          <th width="80">操作</th>
         </tr>
         </thead>
         <tbody ng-show="active === 'all'" ng-repeat="check in ALLList">
@@ -726,13 +729,28 @@
             </div>
           </td>
           <td ng-if="check.thisMonthCount.length === 0">-</td>
+
+          <td ng-if="check.thisMonthTodoCount.length > 0">
+            <div ng-repeat="count in check.thisMonthTodoCount">
+              <span ng-if="count.amount > 0">{{count.currency}}：{{count.amount | number:2}}</span>
+            </div>
+          </td>
+          <td ng-if="check.thisMonthTodoCount.length === 0">-</td>
+
+          <td ng-if="check.thisMonthDoneCount.length > 0">
+            <div ng-repeat="count in check.thisMonthDoneCount">
+              <span ng-if="count.amount > 0">{{count.currency}}：{{count.amount | number:2}}</span>
+            </div>
+          </td>
+          <td ng-if="check.thisMonthDoneCount.length === 0">-</td>
+
           <td ng-if="check.totalCount.length > 0">
             <div ng-repeat="count in check.totalCount">
               <span ng-if="count.amount > 0">{{count.currency}}：{{count.amount | number:2}}</span>
             </div>
           </td>
           <td ng-if="check.totalCount.length === 0">-</td>
-          <td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">对账明细</td>
+          <td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">明细</td>
         </tr>
         </tbody>
 
@@ -753,9 +771,9 @@
           </td>
         </tr>
         </tbody>
-        <tbody ng-if="active === 'all' && (ALLList !== undefined && ALLList.length == 0)">
+        <tbody ng-if="active === 'all' && (ALLList === undefined || ALLList.length == 0)">
         <tr>
-          <td colspan="4">
+          <td colspan="6">
             <div class="empty">
               <div class="left_img">
                 <a><img src="static/img/all/empty-cart.png"></a>
@@ -795,6 +813,30 @@
               </div>
             </label>
           </div>
+
+          <div style="text-align: left;margin-top: 20px">
+            <label>本期间已对总额：</label>
+            <label style="text-align:left;vertical-align: top;">
+              <div ng-if="dataInfo.thisMonthDoneCount.length > 0" ng-repeat="count in dataInfo.thisMonthDoneCount">
+                <span>{{count.currency}}：{{count.amount | number:2}}</span>
+              </div>
+              <div ng-if="dataInfo.thisMonthDoneCount.length === 0">
+                0
+              </div>
+            </label>
+          </div>
+          <div style="text-align: left;margin-top: 20px">
+            <label>本期间未对总额：</label>
+            <label style="text-align:left;vertical-align: top;">
+              <div ng-if="dataInfo.thisMonthTodoCount.length > 0" ng-repeat="count in dataInfo.thisMonthTodoCount">
+                <span>{{count.currency}}：{{count.amount | number:2}}</span>
+              </div>
+              <div ng-if="dataInfo.thisMonthTodoCount.length === 0">
+                0
+              </div>
+            </label>
+          </div>
+
           <div style="text-align: left;margin-top: 20px">
             <label>应付总额：</label>
             <label style="text-align:left;vertical-align: top;">
@@ -898,7 +940,7 @@
         <!--</div>-->
         <!--</div>-->
         <!--ng-show="condition.$open">-->
-        <label class="col-sm-2 control-label">税率：</label>
+        <label class="col-sm-2 control-label">税&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;率：</label>
         <div class="col-sm-4">
           <div class="form-group form-group-sm has-feedback">
             <input type="search" class="form-control input-sm"
@@ -950,15 +992,18 @@
             <!--<th width="36" style="vertical-align: middle;"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>-->
             <!--<th width="70">客户<br>名称</th>-->
             <th width="70">采购单</th>
+            <th width="60">发货单</th>
+            <th width="60">验收单</th>
             <th width="70">物料名称</th>
             <th width="70">规格型号</th>
-            <th width="60">发货单</th>
             <th width="55">发货数量</th>
-            <th width="60">验收单</th>
             <th width="100">验收数量</th>
             <th width="40">单价</th>
             <th width="40">税率</th>
             <th width="70">小计</th>
+            <th width="100">
+              对账人<br />/日期
+            </th>
             <!--<th width="35">序号</th>-->
             <!--<th width="60">类型</th>-->
             <!--<th width="60">单据<br>日期</th>-->
@@ -973,37 +1018,31 @@
       <div class="table-body-wrap">
         <table class="table table-bordered">
           <tr ng-repeat="check in data" ng-click="checkOne(check);getTotalMoney()" class="thAlign" style="height: 40px;">
-            <!--<td width="36" style="text-align: center;vertical-align: middle;">-->
-              <!--<input ng-model="check.$selected" name="checkbox" type="checkbox" ng-checked="check.$selected" ng-click="stopPrevent($event)"></td>-->
             <td width="70">{{::check.ordercode}}</td>
+            <td width="60">{{::check.sendcode}}</td>
+            <td width="60">{{::check.inoutno}}</td>
             <td width="70" title="{{check.prodtitle}}">
               <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodtitle}}</div>
             </td>
             <td width="70" title="{{check.prodspec}}">
               <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodspec}}</div></td>
-            <td width="60">{{::check.sendcode}}</td>
+
             <td width="55">{{::check.qty}}</td>
-            <td width="60">{{::check.inoutno}}</td>
+
             <td width="100">{{::check.thischeckqty}}</td>
             <td width="40">{{::check.orderprice}}</td>
             <td width="40" align="center">{{::check.taxrate}}</td>
             <td width="70">{{::(check.orderprice || 0)*(check.thischeckqty || 0) | number:2}}</td>
-            <!--<td width="70" title="{{check.custname}}"><div-->
-            <!--style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.custname}}</div></td>-->
-            <!--<td width="35" align="center">{{::check.detno}}</td>-->
-            <!--<td width="60">{{::check.piclass}}</td>-->
-            <!--<td width="60">{{::check.pidate | date:'yyyy-MM-dd' }}</td>-->
-            <!--<td width="90" title="{{check.receivename}}">-->
-            <!--<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.receivename}}</div>-->
-            <!--</td>-->
-            <!--<td width="65">{{::check.prodcode}}</td>-->
-            <!--<td width="65">{{::check.factory}}</td>-->
-            <!--<td width="30">{{::check.currency}}</td>-->
-            <!--<td width="60">{{::(check.qty || 0)*(check.orderprice || 0) | number:2}}</td>-->
-
+            <td width="100" ng-if="check.haveChecked === 1">
+              <div>{{::check.recorder || '-'}}</div>
+              <div>{{::check.apCheckDate | date:'yyyy年MM月dd日'  || '-'}}</div>
+            </td>
+            <td width="100" ng-if="check.haveChecked !== 1">
+              未对账
+            </td>
           </tr>
           <tr ng-if="!data || data.length==0">
-            <td colspan="10">
+            <td colspan="11">
               <div class="empty-block">
                 <i class="fa fa-exclamation-circle"></i>
                 <p class="text-muted">没有对账数据，请先筛选</p>

src/main/webapp/resources/view/usercenter/b2b/order/usercenter_order.html

@@ -681,7 +681,7 @@
 				</div>
 			</div>
 			<div class="sreach-input fr">
-				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+				<input type="search" placeholder="单据编号/供应商名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
 				<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 			</div>
 		</div>

src/main/webapp/resources/view/usercenter/forstore/product_upload.html

@@ -790,7 +790,7 @@
         top: 50%;
         left: 50%;
         margin-left: -50px;
-        margin-top: -60px;
+        margin-top: -180px;
     }
     #canvas {
         margin: 5% auto 0;

src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -509,6 +509,7 @@
       <li class="down-purchase" style="margin-right: 0;min-width: 80px"  ng-hide="active === 'all'">
         <a href="#" style="min-width: 80px" ng-click="exportXls()" target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</a>
       </li>
+        <li style="float: right;font-size: 14px;cursor: pointer;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()"><img src="/static/img/vendor/images/backIcon.png" width="20"/>返回</li>
       <!--<li class="down-purchase" style="margin-right: 0;min-width: 80px" ng-hide="showNotCheck">-->
         <!--<a class="text-simple append" style="min-width: 80px" ui-sref="fa_apCheckList" title="新增对账单">-->
           <!--<i class="fa fa-plus-square fa-fw"></i>新增对账单-->
@@ -517,16 +518,16 @@
 
     </ul>
   </div>
-  <div class="com_tab tab_top" style="margin-bottom: 0px">
-    <ul>
-      <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 未对账</a></li>
+  <!--<div class="com_tab tab_top" style="margin-bottom: 0px">-->
+    <!--<ul>-->
+      <!--<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 未对账</a></li>-->
       <!--<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待确认(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</a></li>-->
-      <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已对账</a></li>
+      <!--<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已对账</a></li>-->
         <!--(<em ng-class="{'color-black': !unread.cancelled }" ng-bind="unread.cancelled || 0"></em>)-->
-      <li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已作废</a></li>
-        <li style="float: right;font-size: 14px;cursor: pointer;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()"><img src="/static/img/vendor/images/backIcon.png" width="20"/>返回</li>
-    </ul>
-  </div>
+      <!--<li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已作废</a></li>-->
+        <!--<li style="float: right;font-size: 14px;cursor: pointer;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()"><img src="/static/img/vendor/images/backIcon.png" width="20"/>返回</li>-->
+    <!--</ul>-->
+  <!--</div>-->
   <div class="screen check-filter" ng-show="!showNotCheck">
     <div class="radio-block date-radio" ng-show="active !== 'all'" style="width: 33%">
       时间：
@@ -711,14 +712,16 @@
 
         <thead ng-show="active === 'all'">
           <tr class="header">
-            <th width="313">客户名称</th>
-            <th width="250">本月应收</th>
-            <th width="250">应收总额</th>
-            <th width="160">操作</th>
+            <th width="200">客户名称</th>
+              <th width="170">本月应收</th>
+              <th width="170">本月未对</th>
+              <th width="170">本月已对</th>
+              <th width="170">应收总额</th>
+            <th width="80">操作</th>
           </tr>
         </thead>
         <tbody ng-show="active === 'all'" ng-repeat="check in ALLList">
-          <tr >
+          <tr>
             <td style="color: #3f84f6">{{::check.myEnterprise.enName}}</td>
               <td ng-if="check.thisMonthCount.length > 0">
                   <div ng-repeat="count in check.thisMonthCount">
@@ -726,13 +729,28 @@
                   </div>
               </td>
               <td ng-if="check.thisMonthCount.length === 0">-</td>
+
+              <td ng-if="check.thisMonthTodoCount.length > 0">
+                  <div ng-repeat="count in check.thisMonthTodoCount">
+                      <span ng-if="count.amount > 0">{{count.currency}}：{{count.amount | number:2}}</span>
+                  </div>
+              </td>
+              <td ng-if="check.thisMonthTodoCount.length === 0">-</td>
+
+              <td ng-if="check.thisMonthDoneCount.length > 0">
+                  <div ng-repeat="count in check.thisMonthDoneCount">
+                      <span ng-if="count.amount > 0">{{count.currency}}：{{count.amount | number:2}}</span>
+                  </div>
+              </td>
+              <td ng-if="check.thisMonthDoneCount.length === 0">-</td>
+
               <td ng-if="check.totalCount.length > 0">
                   <div ng-repeat="count in check.totalCount">
                       <span ng-if="count.amount > 0">{{count.currency}}：{{count.amount | number:2}}</span>
                   </div>
               </td>
               <td ng-if="check.totalCount.length === 0">-</td>
-            <td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">对账明细</td>
+            <td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">明细</td>
           </tr>
         </tbody>
 
@@ -753,9 +771,9 @@
           </td>
         </tr>
         </tbody>
-        <tbody ng-if="active === 'all' && (ALLList !== undefined && ALLList.length == 0)">
+        <tbody ng-if="active === 'all' && (ALLList === undefined || ALLList.length == 0)">
           <tr>
-            <td colspan="4">
+            <td colspan="6">
               <div class="empty">
                 <div class="left_img">
                   <a><img src="static/img/all/empty-cart.png"></a>
@@ -795,6 +813,29 @@
                 </div>
             </label>
         </div>
+            <div style="text-align: left;margin-top: 20px">
+                <label>本期间已对总额：</label>
+                <label style="text-align:left;vertical-align: top;">
+                    <div ng-if="dataInfo.thisMonthDoneCount.length > 0" ng-repeat="count in dataInfo.thisMonthDoneCount">
+                        <span>{{count.currency}}：{{count.amount | number:2}}</span>
+                    </div>
+                    <div ng-if="dataInfo.thisMonthDoneCount.length === 0">
+                        0
+                    </div>
+                </label>
+            </div>
+            <div style="text-align: left;margin-top: 20px">
+                <label>本期间未对总额：</label>
+                <label style="text-align:left;vertical-align: top;">
+                    <div ng-if="dataInfo.thisMonthTodoCount.length > 0" ng-repeat="count in dataInfo.thisMonthTodoCount">
+                        <span>{{count.currency}}：{{count.amount | number:2}}</span>
+                    </div>
+                    <div ng-if="dataInfo.thisMonthTodoCount.length === 0">
+                        0
+                    </div>
+                </label>
+            </div>
+
         <div style="text-align: left;margin-top: 20px">
             <label>应收总额：</label>
             <label style="text-align:left;vertical-align: top;">
@@ -881,7 +922,7 @@
                   ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
           <div class="btn-group btn-group-sm">
             <a class="btn btn-default" ng-click="searchOrder()" title="筛选"><i class="fa fa-search fa-fw btn-icon-left"></i>筛选</a>
-            <a class="btn btn-default" ng-click="createApCheck(check.$selected)" ng-disabled="!data || data.length==0"><i class="fa fa-check-circle-o fa-fw btn-icon-left"></i>对账</a>
+            <a class="btn btn-default" ng-click="createApCheck(check.$selected)" ng-disabled="!data || data.length==0"><i class="fa fa-check-circle-o fa-fw btn-icon-left"></i>确认</a>
             <a class="btn btn-default" ng-click="exportApcheckList()" title="导出Excel" ng-disabled="!data || data.length==0"><i class="fa fa-file-text fa-fw btn-icon-left"></i>导出</a>
           </div>
         </div>
@@ -898,7 +939,7 @@
           <!--</div>-->
         <!--</div>-->
         <!--ng-show="condition.$open">-->
-        <label class="col-sm-2 control-label">税率：</label>
+        <label class="col-sm-2 control-label">税&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;率：</label>
         <div class="col-sm-4">
           <div class="form-group form-group-sm has-feedback">
             <input type="search" class="form-control input-sm"
@@ -945,72 +986,87 @@
     <!-- 标签scroll-table用于表头滚动 -->
     <div class="table-wrap" id="order-detail-list" scroll-table>
       <div class="table-header-wrap">
-        <table class="table table-bordered">
-          <tr>
-            <th width="36" style="vertical-align: middle;"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>
-            <!--<th width="70">客户<br>名称</th>-->
-            <th width="70">采购单</th>
-            <th width="70">物料名称</th>
-            <th width="70">规格型号</th>
-            <th width="60">发货单</th>
-            <th width="55">发货数量</th>
-            <th width="60">验收单</th>
-            <th width="100">验收数量</th>
-            <th width="40">单价</th>
-            <th width="40">税率</th>
-            <th width="70">小计</th>
-            <!--<th width="35">序号</th>-->
-            <!--<th width="60">类型</th>-->
-            <!--<th width="60">单据<br>日期</th>-->
-            <!--<th width="90">应付<br>供应商</th>-->
-            <!--<th width="65">客户<br>料号</th>-->
-            <!--<th width="65">送货<br>工厂</th>-->
-            <!--<th width="30">币别</th>-->
-            <!--<th width="60">金额</th>-->
-          </tr>
-        </table>
+          <table class="table table-bordered">
+              <tr>
+                  <th width="55" style="vertical-align: middle;"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>
+                  <!--<th width="70">客户<br>名称</th>-->
+                  <th width="70">采购单</th>
+                  <th width="60">发货单</th>
+                  <th width="60">验收单</th>
+                  <th width="70">物料名称</th>
+                  <th width="70">规格型号</th>
+                  <!--<th width="60">发货单</th>-->
+                  <th width="55">发货数量</th>
+                  <th width="80">验收数量</th>
+                  <th width="40">单价</th>
+                  <th width="40">税率</th>
+                  <th width="70">小计</th>
+                  <th width="110">
+                      对账人<br />/日期
+                  </th>
+                  <!--<th width="35">序号</th>-->
+                  <!--<th width="60">类型</th>-->
+                  <!--<th width="60">单据<br>日期</th>-->
+                  <!--<th width="90">应付<br>供应商</th>-->
+                  <!--<th width="65">客户<br>料号</th>-->
+                  <!--<th width="65">送货<br>工厂</th>-->
+                  <!--<th width="30">币别</th>-->
+                  <!--<th width="60">金额</th>-->
+              </tr>
+          </table>
       </div>
       <div class="table-body-wrap">
-        <table class="table table-bordered">
-          <tr ng-repeat="check in data" ng-click="checkOne(check);getTotalMoney()" class="thAlign" style="height: 40px;">
-            <td width="36" style="text-align: center;vertical-align: middle;">
-              <input ng-model="check.$selected" name="checkbox" type="checkbox" ng-checked="check.$selected" ng-click="stopPrevent($event)"></td>
-            <td width="70">{{::check.ordercode}}</td>
-            <td width="70" title="{{check.prodtitle}}">
-              <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodtitle}}</div>
-            </td>
-            <td width="70" title="{{check.prodspec}}">
-              <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodspec}}</div></td>
-            <td width="60">{{::check.sendcode}}</td>
-            <td width="55">{{::check.qty}}</td>
-            <td width="60">{{::check.inoutno}}</td>
-            <td width="100">{{::check.thischeckqty}}</td>
-            <td width="40">{{::check.orderprice}}</td>
-            <td width="40" align="center">{{::check.taxrate}}</td>
-            <td width="70">{{::(check.orderprice || 0)*(check.thischeckqty || 0) | number:2}}</td>
-            <!--<td width="70" title="{{check.custname}}"><div-->
-                    <!--style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.custname}}</div></td>-->
-            <!--<td width="35" align="center">{{::check.detno}}</td>-->
-            <!--<td width="60">{{::check.piclass}}</td>-->
-            <!--<td width="60">{{::check.pidate | date:'yyyy-MM-dd' }}</td>-->
-            <!--<td width="90" title="{{check.receivename}}">-->
-              <!--<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.receivename}}</div>-->
-            <!--</td>-->
-            <!--<td width="65">{{::check.prodcode}}</td>-->
-            <!--<td width="65">{{::check.factory}}</td>-->
-            <!--<td width="30">{{::check.currency}}</td>-->
-            <!--<td width="60">{{::(check.qty || 0)*(check.orderprice || 0) | number:2}}</td>-->
+          <table class="table table-bordered">
+              <tr ng-repeat="check in data" ng-click="checkOne(check);getTotalMoney()" class="thAlign" style="height: 40px;">
+                  <td width="55" style="text-align: center;vertical-align: middle;">
+                      <input ng-model="check.$selected" name="checkbox" type="checkbox" ng-checked="check.$selected" ng-click="stopPrevent($event)" ng-if="check.haveChecked !== 1">
+                      <span ng-if="check.haveChecked === 1">已对账</span>
+                  </td>
+                  <td width="70">{{::check.ordercode}}</td>
+                  <td width="60">{{::check.sendcode}}</td>
+                  <td width="60">{{::check.inoutno}}</td>
+                  <td width="70" title="{{check.prodtitle}}">
+                      <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodtitle}}</div>
+                  </td>
+                  <td width="70" title="{{check.prodspec}}">
+                      <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodspec}}</div></td>
 
-          </tr>
-          <tr ng-if="!data || data.length==0">
-            <td colspan="11">
-              <div class="empty-block">
-                <i class="fa fa-exclamation-circle"></i>
-                <p class="text-muted">没有对账数据，请先筛选</p>
-              </div>
-            </td>
-          </tr>
-        </table>
+                  <td width="55">{{::check.qty}}</td>
+
+                  <td width="80">{{::check.thischeckqty}}</td>
+                  <td width="40">{{::check.orderprice}}</td>
+                  <td width="40" align="center">{{::check.taxrate}}</td>
+                  <td width="70">{{::(check.orderprice || 0)*(check.thischeckqty || 0) | number:2}}</td>
+                  <td width="110" ng-if="check.haveChecked === 1">
+                      <div>{{::check.recorder || '-'}}</div>
+                      <div>{{::check.apCheckDate | date:'yyyy年MM月dd日'  || '-'}}</div>
+                  </td>
+                  <td width="110" ng-if="check.haveChecked !== 1">
+                      未对账
+                  </td>
+                  <!--<td width="70" title="{{check.custname}}"><div-->
+                  <!--style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.custname}}</div></td>-->
+                  <!--<td width="35" align="center">{{::check.detno}}</td>-->
+                  <!--<td width="60">{{::check.piclass}}</td>-->
+                  <!--<td width="60">{{::check.pidate | date:'yyyy-MM-dd' }}</td>-->
+                  <!--<td width="90" title="{{check.receivename}}">-->
+                  <!--<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.receivename}}</div>-->
+                  <!--</td>-->
+                  <!--<td width="65">{{::check.prodcode}}</td>-->
+                  <!--<td width="65">{{::check.factory}}</td>-->
+                  <!--<td width="30">{{::check.currency}}</td>-->
+                  <!--<td width="60">{{::(check.qty || 0)*(check.orderprice || 0) | number:2}}</td>-->
+
+              </tr>
+              <tr ng-if="!data || data.length==0">
+                  <td colspan="11">
+                      <div class="empty-block">
+                          <i class="fa fa-exclamation-circle"></i>
+                          <p class="text-muted">没有对账数据，请先筛选</p>
+                      </div>
+                  </td>
+              </tr>
+          </table>
       </div>
       <div style="padding: 10px 20px">本期间应收总额：{{totalMoney | number:2 || 0}}</div>
     </div>

src/main/webapp/resources/view/vendor/b2b/apCheck_detail.html

@@ -191,6 +191,11 @@
       <!-- <a ng-click="print(order)" class="pull-right text-simple"><i
       class="fa fa-print fa-fw"></i>打印</a> -->
     </div>
+    <div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;;color: #fff;" ui-sref="fa_apCheck">
+      <img src="static/img/vendor/images/backIcon.png" width="20"/>返回
+      <!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
+
+    </div>
   </div>
   <div class="pane-body">
     <div class="bottomB">
@@ -202,10 +207,10 @@
         <span class="title">客户名称</span>
         <div class="content" ng-bind="::data.custName"></div>
       </div>
-      <div class="col-xs-6">
-        <span class="title">应付供应商</span>
-        <div class="content" ng-bind="::data.items[0].receiveName"></div>
-      </div>
+      <!--<div class="col-xs-6">-->
+        <!--<span class="title">应付供应商</span>-->
+        <!--<div class="content" ng-bind="::data.items[0].receiveName"></div>-->
+      <!--</div>-->
     </div>
     <div class="row row-sm item">
       <div class="col-xs-6">
@@ -277,12 +282,12 @@
       <table class="block table table-default table-striped table-hover">
         <thead>
         <tr class="header">
-          <th width="30" style="padding:8px 0;">行号</th>
-          <th width="120">商品</th>
           <th width="40">采购单号</th>
-          <th>采购序号</th>
           <th width="100">验收单</th>
-          <th>验收单序号</th>
+          <!--<th width="30" style="padding:8px 0;">行号</th>-->
+          <th width="120">商品</th>
+          <!--<th>采购序号</th>-->
+          <!--<th>验收单序号</th>-->
           <th>单价</th>
           <!--<th width="80">单据类型</th>-->
           <th>税率</th>
@@ -293,16 +298,15 @@
         </thead>
         <tbody ng-repeat="item in data.items" style="text-align: center;">
         <tr>
-          <td ng-bind="item.number" style="padding:8px 0;"></td>
+          <td ng-bind="item.orderCode"></td>
+          <td ng-bind="item.inoutno"></td>
+          <!--<td ng-bind="item.number" style="padding:8px 0;"></td>-->
           <td style="max-width: 250px;" class="text-left">
             <div>编号： <span ng-bind="item.prodCode"></span></div>
             <div>规格： <span ng-bind="item.prodSpec"></span></div>
           </td>
-          <td ng-bind="item.orderCode"></td>
-          <td ng-bind="item.orderDetno"></td>
-          <td ng-bind="item.inoutno"></td>
-          <td ng-bind="item.inoutnodetno"></td>
-
+          <!--<td ng-bind="item.orderDetno"></td>-->
+          <!--<td ng-bind="item.inoutnodetno"></td>-->
           <!--<td ng-bind="item.orderClass"></td>-->
           <td ng-bind="isUser?'-':item.price"></td>
           <td ng-bind="item.taxrate"></td>

src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -1142,12 +1142,12 @@
                 </div>
                 <div class="content-line">
                     <div class="form-item form-left">
-                        <span><i>*</i>交期：</span>
-                        <input type="number" class="form-control" ng-change="onLeadtimeInput()" ng-blur="onLeadtimeBlur()" ng-model="inquiryItem.leadtime" placeholder="天数">
+                        <span><i>*</i>交期(天)：</span>
+                        <input type="text" class="form-control" ng-change="onLeadtimeInput()" ng-blur="onLeadtimeBlur()" ng-model="inquiryItem.leadtime" placeholder="最长交期">
                     </div>
                     <div class="form-item form-right">
                         <span><i>*</i>税率：</span>
-                        <input type="number" style="width:133px;margin-right:5px;" class="form-control" ng-change="onTaxrateInput()" ng-blur="onTaxrateBlur()" ng-model="inquiryItem.taxrate" placeholder="税率">%
+                        <input type="text" style="width:133px;margin-right:5px;" class="form-control" ng-change="onTaxrateInput()" ng-blur="onTaxrateBlur()" ng-model="inquiryItem.taxrate" placeholder="税率">%
                     </div>
                     <div class="form-item form-upload">
                         <!--
@@ -1170,7 +1170,7 @@
                         <input type="text" class="form-control" placeholder="数量">
                         -
                         -->
-                        <input type="number" class="form-control" ng-blur="onReplyLapQtyBlur($index)" ng-change="onReplyLapQtyInput($index)" ng-model="reply.lapQty" placeholder="分段数量">
+                        <input type="text" class="form-control" ng-blur="onReplyLapQtyBlur($index)" ng-change="onReplyLapQtyInput($index)" ng-model="reply.lapQty" placeholder="分段数量">
                     </div>
                     <div class="form-item form-right">
                         <span><i>*</i>单价<span ng-if="inquiryItem.currency" ng-bind="inquiryItem.currency == 'USD' ? '$' : '¥'"></span>：</span>
@@ -1178,7 +1178,7 @@
                             <option value="RMB">¥</option>
                             <option value="USD">$</option>
                         </select>
-                        <input type="number" class="form-control" ng-change="onReplyPriceInput($index)" ng-blur="onReplyPriceBlur($index)" ng-model="reply.price" placeholder="分段单价">
+                        <input type="text" class="form-control" ng-change="onReplyPriceInput($index)" ng-blur="onReplyPriceBlur($index)" ng-model="reply.price" placeholder="分段单价">
                         <i class="fa fa-minus-circle" ng-if="inquiryItem.replies.length > 1" ng-click="setReplies('sub', $index)"></i>
                         <i class="fa fa-plus-circle" ng-if="inquiryItem.replies.length < 5" ng-click="setReplies('add', $index)"></i>
                     </div>

src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -812,7 +812,7 @@
         top: 50%;
         left: 50%;
         margin-left: -50px;
-        margin-top: -60px;
+        margin-top: -180px;
     }
     #canvas {
         margin: 5% auto 0;

src/test/java/com/uas/platform/b2c/DesTest.java

@@ -11,7 +11,7 @@ import java.util.Set;
 
 public class DesTest {
     @Test
-    public void test(){
+    public void test() {
         // 测试
         System.out.println("text & dev: ");
         prindHexString("jdbc:mysql://192.168.100.3:3306/mall_test_dev?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&useUnicode=true");