Merge remote-tracking branch 'origin/release-201834-wangcz' into release-201834-wangcz

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

@@ -350,7 +350,7 @@ public class Goods implements Serializable {
 	 * 分段报价(List)
 	 */
 	@Transient
-	private List<GoodsQtyPrice> prices;
+	private List<GoodsQtyPrice> prices = new ArrayList<>();
 
     /**
      * 分段价格最大序号值
@@ -1700,8 +1700,9 @@ public class Goods implements Serializable {
 		goods.setProduceDate(product.getProduceDate());
 		goods.setUuid(product.getCmpUuId());
 		goods.setMinPackQty(product.getMinPackQty());
-		goods.setPublisherName(SystemSession.getUser().getUserName());
 		goods.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+		goods.setPublisherName(SystemSession.getUser().getUserName());
+		goods.setPublisherUU(SystemSession.getUser().getUserUU());
 		goods.setPublishPhone(SystemSession.getUser().getUserTel());
 		return goods;
 	}

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

@@ -4062,12 +4062,43 @@ public class GoodsServiceImpl implements GoodsService {
      */
     @Override
     public com.uas.sso.support.Page<BrandCount> getBrandProductsCount(Pageable pageable, Date startTime, Date endTime) {
+        java.sql.Date startDate = assignStartDate(startTime);
+        java.sql.Date endDate = assignEndDate(endTime);
+        StringBuffer sql = new StringBuffer("select br_name_en as brand, count(1) as count from trade$goods where br_name_en is not null and go_createddate between ? and ? group by br_name_en");
+        StringBuffer countSql = new StringBuffer("select count(1) from (").append(sql).append(") as a");
+        Integer count = commonDao.queryForObject(countSql.toString(), Integer.class, startDate, endDate);
+        // 分页参数
+        Integer offset = (pageable.getPageNumber() - 1) * pageable.getPageSize();
+        sql.append(" limit ? offset ?");
+        List<BrandCount> brandCountList = commonDao.query(sql.toString(), BrandCount.class, startDate, endDate, pageable.getPageSize(), offset);
+        return new com.uas.sso.support.Page<>(pageable.getPageNumber(), pageable.getPageSize(), brandCountList, count);
+    }
+
+    /**
+     * 设置开始时间
+     *
+     * @param startTime 前端传入开始时间
+     * @return java.sql.Date
+     */
+    private java.sql.Date assignStartDate(Date startTime) {
         java.sql.Date startDate;
         if (null == startTime) {
             startDate = new java.sql.Date(DateUtils.addTime(new Date(), -30, 0, 0, 0).getTime());
         } else {
             startDate = new java.sql.Date(startTime.getTime());
         }
+       return startDate;
+    }
+
+    /**
+     * 设置截止时间
+     * 截止时间+1是取到截止时间的23:59:59数据，
+     * java.sql.Date 精确到天，所以采用+1天小于来过滤
+     *
+     * @param endTime 前端传入截止时间
+     * @return java.sql.Date
+     */
+    private java.sql.Date assignEndDate(Date endTime) {
         java.sql.Date endDate;
         // 截止时间+1天
         if (null == endTime) {
@@ -4077,14 +4108,7 @@ public class GoodsServiceImpl implements GoodsService {
         }
         Integer addend = 60 * 60 * 24 * 1000;
         endDate = new java.sql.Date(endDate.getTime() + addend);
-        StringBuffer sql = new StringBuffer("select br_name_en as brand, count(1) as count from product$brand where br_createtime >= ? and br_createtime < ? group by br_name_en");
-        StringBuffer countSql = new StringBuffer("select count(1) from (").append(sql).append(") as a");
-        Integer count = commonDao.queryForObject(countSql.toString(), Integer.class, startDate, endDate);
-        // 分页参数
-        Integer offset = (pageable.getPageNumber() - 1) * pageable.getPageSize();
-        sql.append(" limit ? offset ?");
-        List<BrandCount> brandCountList = commonDao.query(sql.toString(), BrandCount.class, startDate, endDate, pageable.getPageSize(), offset);
-        return new com.uas.sso.support.Page<>(pageable.getPageNumber(), pageable.getPageSize(), brandCountList, count);
+        return endDate;
     }
 
     /**
@@ -4097,23 +4121,28 @@ public class GoodsServiceImpl implements GoodsService {
      */
     @Override
     public com.uas.sso.support.Page<KindHierarchicalCount> getKindProductsCount(Pageable pageable, Date startTime, Date endTime) {
-        StringBuffer sql = new StringBuffer("select ki_name as thirdKind, ki_parentid as parentId, count(1) as count from product$kind group by ki_name, ki_parentid");
+        java.sql.Date startDate = assignStartDate(startTime);
+        java.sql.Date endDate = assignEndDate(endTime);
+        StringBuffer sql = new StringBuffer("select ki_name as thirdKind, go_kind_uuid as kindId, count(1) as count from trade$goods where go_createddate between ? and ? group by ki_name, go_kind_uuid");
         StringBuffer countSql = new StringBuffer("select count(1) from (").append(sql).append(") as a");
-        Integer count = commonDao.queryForObject(countSql.toString(), Integer.class);
+        Integer count = commonDao.queryForObject(countSql.toString(), Integer.class, startDate, endDate);
         // 分页参数
         Integer offset = (pageable.getPageNumber() - 1) * pageable.getPageSize();
         sql.append(" limit ? offset ?");
-        List<KindHierarchicalCount> kindList = commonDao.query(sql.toString(), KindHierarchicalCount.class, pageable.getPageSize(), offset);
+        List<KindHierarchicalCount> kindList = commonDao.query(sql.toString(), KindHierarchicalCount.class, startDate, endDate, pageable.getPageSize(), offset);
         if (CollectionUtils.isNotEmpty(kindList)) {
             kindList.forEach(kind -> {
-                if (null != kind.getParentId() && kind.getParentId() != 0) {
-                    KindInfo parentKind = kindInfoDao.findOne(kind.getParentId());
-                    if (null != parentKind) {
-                        kind.setSecondKind(parentKind.getNameCn());
-                        if (null != parentKind.getParentid() && parentKind.getParentid() != 0) {
-                            KindInfo firstKind = kindInfoDao.findOne(parentKind.getParentid());
-                            if (null != firstKind) {
-                                kind.setFirstKind(firstKind.getNameCn());
+                if (null != kind.getKindId()) {
+                    KindInfo kindInfo = kindInfoDao.findOne(kind.getKindId());
+                    if (null != kindInfo && null != kindInfo.getParentid() && kindInfo.getParentid() != 0) {
+                        KindInfo parentKind = kindInfoDao.findOne(kindInfo.getParentid());
+                        if (null != parentKind) {
+                            kind.setSecondKind(parentKind.getNameCn());
+                            if (null != parentKind.getParentid() && parentKind.getParentid() != 0) {
+                                KindInfo firstKind = kindInfoDao.findOne(parentKind.getParentid());
+                                if (null != firstKind) {
+                                    kind.setFirstKind(firstKind.getNameCn());
+                                }
                             }
                         }
                     }

src/main/java/com/uas/platform/b2c/prod/store/facade/impl/StoreApplyFacadeImpl.java

@@ -103,10 +103,8 @@ public class StoreApplyFacadeImpl implements StoreApplyFacade {
 			}
 			storeApply.setReason(apply.getReason());
 		}
-		Date date = new Date();
 		// 保存审核时的审核人信息和是否通过状态
 		storeApply.setFinalPerson(user.getUserName());
-		storeApply.setAuthTime(date);
 		storeApply.setStatus(status);
 		// 保存审核时的企业信息
 		storeApply.setEnType(apply.getEnType());

src/main/java/com/uas/platform/b2c/prod/store/model/KindHierarchicalCount.java

@@ -33,6 +33,11 @@ public class KindHierarchicalCount {
      */
     private Long parentId;
 
+    /**
+     * 类目Id
+     */
+    private Long kindId;
+
     public String getFirstKind() {
         return firstKind;
     }
@@ -72,4 +77,12 @@ public class KindHierarchicalCount {
     public void setParentId(Long parentId) {
         this.parentId = parentId;
     }
+
+    public Long getKindId() {
+        return kindId;
+    }
+
+    public void setKindId(Long kindId) {
+        this.kindId = kindId;
+    }
 }

src/main/webapp/WEB-INF/views/normal/adminWithNav.html

@@ -29,9 +29,6 @@
 	<!-- main menu start -->
 	<div class="sidebar-nav main-menu">
 		<ul class="nav nav-tabs nav-stacked">
-			<li class="nav-header">B2B</li>
-			<li class="nav-node"><a href="#/b2b/manage"><i
-					class="fa fa-home"></i><span> b2b后台管理</span></a></li>
 
 			<li class="nav-header">数据管理</li>
 			<li class="nav-node"><a href="#/statsData"><i
@@ -103,6 +100,8 @@
 					<!--class="fa fa-home"></i><span> 平台换货出货单管理</span></a></li>-->
 
 			<li class="nav-header">产品管理</li>
+			<li class="nav-node"><a href="#/manage"><i
+					class="fa fa-flag"></i><span> 产品管理</span></a></li>
 			<li class="nav-node"><a href="#trade/goodsStatistics"><i
 					class="fa fa-filter"></i><span> 在售产品信息统计</span></a></li>
 			<li class="nav-node"><a href="#product/overtimeBatch"><i
@@ -165,8 +164,6 @@
 			<li class="nav-node"><a href="#audit/bankinfo"><i class="fa fa-bank"></i><span> 银行账户信息</span></a></li>
 			<li class="nav-node"><a href="#audit/realAuth"><i class="glyphicon glyphicon-user"></i><span> 实名认证审核</span></a></li>
 			<li class="nav-header">维护</li>
-			<li class="nav-node"><a href="#/manage"><i
-					class="fa fa-flag"></i><span> 产品管理</span></a></li>
 			<li class="nav-node"><a href="#/brand/map"><i
 					class="fa fa-flag"></i><span> 品牌映射维护</span></a></li>
 			<li class="nav-node"><a href="#/store/company"><i

src/main/webapp/resources/js/admin/app.js

@@ -844,13 +844,6 @@
             controller: 'LoanApplyListCtrl',
             controllerUrl: 'app/controllers/fa/LoanApplyListCtrl',
             title: '消息列表'
-        })).state('b2bManage', angularAMD.route({
-			// b2b后台管理贷款申请列表
-			url: '/b2b/manage',
-            templateUrl: 'static/view/admin/b2b/manage.html',
-            controller: 'b2bManageCtrl',
-            controllerUrl: 'app/controllers/b2b/b2bManageCtrl',
-            title: '贷款申请列表'
         })).state('statsData', angularAMD.route({
             // 后台管理数据统计数据
             url: '/statsData',

src/main/webapp/resources/js/admin/controllers/StoreApplicationCtrl.js

@@ -23,6 +23,10 @@ define([ 'app/app' ], function(app) {
 				name: 'PREPARE',
 				message: '待审核'
 			},
+            CHECK: {
+                name: 'CHECK',
+                message: '待审核'
+            },
 			PASS: {
 				name: 'PASS',
 				message: '已通过'
@@ -116,8 +120,11 @@ define([ 'app/app' ], function(app) {
 						var date = new Date();
 						console.log('TIMESTAMP', date.getTime());
 						angular.forEach(data.content, function (application) {
-							if (application.status === $scope.authType.PREPARE.name) {
+							if (application.status === $scope.authType.PREPARE.name || application.status === $scope.authType.CHECK.name) {
 								var time = date - application.createTime;
+								if (application.status === $scope.authType.CHECK.name) {
+                                    time = date - application.authTime;
+								}
 								// 计算相差天数
 								var days = Math.floor(time / (24 * 3600 * 1000));
 								// 计算相差小时数

src/main/webapp/resources/js/admin/controllers/b2b/b2bManageCtrl.js

@@ -1,37 +0,0 @@
-define(['app/app'], function (app) {
-    'use strict';
-    app.register.controller('b2bManageCtrl', ['$scope', 'ngTableParams', 'manage', 'toaster', 'BaseService', function ($scope, ngTableParams, manage, toaster, BaseService) {
-        //table设置
-        $scope.tableParams = new ngTableParams({
-            page : 1,
-            count : 20
-        }, {
-            total : 0,
-            getData : function ($defer, params) {
-                // $scope.loading = true;
-                var param = BaseService.parseParams(params.url());
-                param.keyword = $scope.keyword;
-                manage.getEnterpriseList(param, function (data) {
-                    params.total(data.totalElements);
-                    $defer.resolve(data.content);
-                }, function (response) {
-                    toaster.pop('error', '获取企业列表失败');
-                });
-            }
-        });
-
-        // 根据关键词搜索
-        $scope.onSearch = function() {
-            $scope.tableParams.reload();
-        }
-
-        /**
-         * 点击跳转商务平台
-         *
-         * @param uu uu号
-         */
-        $scope.redirect = function(uu, url) {
-            window.open('b2b/manage/authed/redirect/' + uu + (url ? ('?url=' + encodeURI(url)) : ''));
-        }
-    }]);
-});

src/main/webapp/resources/js/admin/controllers/product/merchantProductsCtrl.js

@@ -6,7 +6,7 @@ define(['app/app'], function(app) {
 
             $scope.tableParams = new ngTableParams({
                 page: 1,
-                count: 10
+                size: 10
             }, {
                 total: 0,
                 getData: function ($defer, params) {

src/main/webapp/resources/js/admin/controllers/product/productManageCtrl.js

@@ -57,16 +57,16 @@ define(['app/app'], function(app) {
                 } else if (val == 'sixMonth') {
                     $scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
+                } else if (val == 'allMonth') {
+                    $scope.startDate = null;
+                    $scope.endDate = null;
                 }
             }
-            $scope.startFormatDate = _formatDate($scope.startDate, 'yyyy-MM-dd');
-            $scope.endFormatDate = _formatDate($scope.endDate, 'yyyy-MM-dd');
+            $scope.startFormatDate = $scope.startDate ? _formatDate($scope.startDate, 'yyyy-MM-dd') : '';
+            $scope.endFormatDate = $scope.endDate ? _formatDate($scope.endDate, 'yyyy-MM-dd') : '';
             if (val != 'autoMonth') {
                 $scope.manageTableParams.page(1);
                 $scope.manageTableParams.reload();
-            } else {
-                // $scope.startDate = '';
-                // $scope.endDate = '';
             }
         };
 
@@ -108,6 +108,8 @@ define(['app/app'], function(app) {
                 $scope.endDate = new Date($scope.endDate.getFullYear(), $scope.endDate.getMonth(), $scope.endDate.getDate())
                 $scope.endDate = new Date($scope.endDate.getTime() + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
             }
+            $scope.startFormatDate = $scope.startDate ? _formatDate($scope.startDate, 'yyyy-MM-dd') : '';
+            $scope.endFormatDate = $scope.endDate ? _formatDate($scope.endDate, 'yyyy-MM-dd') : '';
             $scope.manageTableParams.page(1);
             $scope.manageTableParams.reload();
         };
@@ -143,8 +145,16 @@ define(['app/app'], function(app) {
             counts: [],
             getData: function ($defer, params) {
                 var param = BaseService.parseParams(params.url());
-                $scope.goodsFilter.startTime = $scope.startFormatDate;
-                $scope.goodsFilter.endTime = $scope.endFormatDate;
+                if($scope.startFormatDate) {
+                    $scope.goodsFilter.startTime = $scope.startFormatDate
+                } else {
+                    delete $scope.goodsFilter.startTime
+                }
+                if($scope.endFormatDate) {
+                    $scope.goodsFilter.endTime = $scope.endFormatDate
+                } else {
+                    delete $scope.goodsFilter.endTime
+                }
                 $scope.pageParams = param;
                 Goods.loadGoodsList(param, $scope.goodsFilter, function (data) {
                     $scope.totalCount = data.totalElements;

src/main/webapp/resources/view/admin/b2b/manage.html

@@ -1,53 +0,0 @@
-<div class="row-fluid sortable">
-    <div class="box">
-        <div class="box-header well" data-original-title>
-            <i class="icon-user"></i> B2B商务企业列表
-        </div>
-        <div class="box-content">
-            <!-- ng-tableStart -->
-            <div class="fullscreen" style="padding: 10px;">
-                <div class="row">
-                    <div class="col-xs-2">
-                        共<span class="badge" ng-bind="tableParams.total()"></span>条
-                    </div>
-                    <div class="col-sm-4">
-                        <div class="input-group">
-                            <input placeholder="企业名称或UU号进行搜索" class="form-control"
-                                   ng-model="keyword"  ng-search="onSearch()" size="16" type="text">
-                            <span class="input-group-btn">
-								<button class="btn btn-primary" type="button" ng-click="onSearch()">搜索</button>
-							</span>
-                        </div>
-                    </div>
-                </div>
-                <table ng-table="tableParams" class="table table-bordered table-striped" style="margin-top: 10px;">
-                    <thead>
-                    <tr>
-                        <th class="text-center" width="60">序号</th>
-                        <th class="text-center" width="100">UU</th>
-                        <th class="text-center" width="200">企业名称</th>
-                        <th class="text-center" width="300">企业地址</th>
-                        <th class="text-center" width="150">营业执照</th>
-                        <th class="text-center" width="120">注册时间</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr ng-repeat="en in $data" ng-click="redirect(en.uu)">
-                        <td class="text-center" ng-bind="$index + 1"></td>
-                        <td class="text-center" ng-bind="en.uu"></td>
-                        <td class="text-center" ng-bind="en.enName"></td>
-                        <td class="text-center" ng-bind="en.enAddress"></td>
-                        <td class="text-center" ng-bind="en.enBussinessCode"></td>
-                        <td class="text-center" ng-bind="en.enDate | date: 'yyyy-MM-dd HH:mm'"></td>
-                    </tr>
-                    <tr ng-if="$data.length == 0">
-                        <td colspan="10" class="text-center" style="line-height: 40px; font-size: 20px;"><i class="fa fa-smile-o fa-lg"></i> 暂未查询到企业信息</td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-            <a id="bottom"></a>
-            <!-- ng-tableEnd -->
-        </div>
-    </div><!--/span-->
-</div><!--/row-->

src/main/webapp/resources/view/admin/index.html

@@ -31,11 +31,6 @@
 					<li><a href="#/product/sailingGoods"> <span
 							class="yellow">8</span> 在售中的产品
 					</a></li>
-					<li>
-						<a href="#/b2b/manage">
-							<span class="green">9</span> b2b管理页面
-						</a>
-					</li>
 					<li>
 						<a href="#/statsData">
 							<span class="red">10</span>数据统计

src/main/webapp/resources/view/admin/product/brandProductsCount.html

@@ -1,7 +1,8 @@
 <div class="row-fluid sortable">
     <div class="box">
         <div class="box-header well" data-original-title>
-            <i class="icon-user"></i> 品牌产品数 &nbsp;&nbsp; ({{startFormatDate}} --- {{endFormatDate}})
+            <i class="icon-user"></i> 品牌产品数 &nbsp;&nbsp;
+            {{startFormatDate ? '(' + startFormatDate + '---' + endFormatDate + ')' : ''}}
         </div>
         <div class="box-content">
             <!-- ng-tableStart -->
@@ -23,7 +24,7 @@
                     <thead>
                     <tr>
                         <th class="text-center" width="80">序号</th>
-                        <th class="text-center">企业名称</th>
+                        <th class="text-center">品牌名称</th>
                         <th class="text-center" width="200">产品数(条)</th>
                     </tr>
                     </thead>
@@ -34,7 +35,7 @@
                         <td class="text-center" ng-bind="item.count"></td>
                     </tr>
                     <tr ng-if="$data.length == 0">
-                        <td colspan="10" class="text-center" style="line-height: 40px; font-size: 20px;"><i class="fa fa-smile-o fa-lg"></i> 暂未查询到企业信息</td>
+                        <td colspan="10" class="text-center" style="line-height: 40px; font-size: 20px;"><i class="fa fa-smile-o fa-lg"></i> 暂未查询到品牌产品相关信息</td>
                     </tr>
                     </tbody>
                 </table>

src/main/webapp/resources/view/admin/product/categoryNumber.html

@@ -1,7 +1,8 @@
 <div class="row-fluid sortable">
     <div class="box">
         <div class="box-header well" data-original-title>
-            <i class="icon-user"></i> 品类产品数 &nbsp;&nbsp; ({{startFormatDate}} --- {{endFormatDate}})
+            <i class="icon-user"></i> 品类产品数 &nbsp;&nbsp;
+            {{startFormatDate ? '(' + startFormatDate + '---' + endFormatDate + ')' : ''}}
         </div>
         <div class="box-content">
             <!-- ng-tableStart -->
@@ -38,7 +39,7 @@
                         <td class="text-center" ng-bind="item.count"></td>
                     </tr>
                     <tr ng-if="$data.length == 0">
-                        <td colspan="10" class="text-center" style="line-height: 40px; font-size: 20px;"><i class="fa fa-smile-o fa-lg"></i> 暂未查询到企业信息</td>
+                        <td colspan="10" class="text-center" style="line-height: 40px; font-size: 20px;"><i class="fa fa-smile-o fa-lg"></i> 暂未查询到品类产品相关信息</td>
                     </tr>
                     </tbody>
                 </table>

src/main/webapp/resources/view/admin/product/merchantProducts.html

@@ -1,7 +1,8 @@
 <div class="row-fluid sortable">
     <div class="box">
         <div class="box-header well" data-original-title>
-            <i class="icon-user"></i> 商家产品数 &nbsp;&nbsp; ({{startFormatDate}} --- {{endFormatDate}})
+            <i class="icon-user"></i> 商家产品数 &nbsp;&nbsp;
+            {{startFormatDate ? '(' + startFormatDate + '---' + endFormatDate + ')' : ''}}
         </div>
         <div class="box-content">
             <!-- ng-tableStart -->

src/main/webapp/resources/view/admin/product/productManage.html

@@ -19,6 +19,11 @@
                         <label for="sixMonth"></label>
                         180天
                     </label>
+                    <label class="com-check-radio">
+                        <input type="radio" id="allMonth" name="date" ng-click="setFilters('dateArea', 'allMonth')" ng-checked="dateArea == 'allMonth'">
+                        <label for="allMonth"></label>
+                        不限
+                    </label>
                     <label class="com-check-radio">
                         <input type="radio" id="autoMonth" name="date" ng-click="setFilters('dateArea', 'autoMonth')" ng-checked="dateArea == 'autoMonth'">
                         <label for="autoMonth"></label>
@@ -198,11 +203,16 @@
         </div>
         <div class="form-item">
             <span class="item-title">查看报表：</span>
-            <span>
+            <span ng-if="startFormatDate">
                 <a ng-href="#/merchantProducts?startDate={{startFormatDate}}&endDate={{endFormatDate}}">商家产品数</a>
                 <a ng-href="#/brandProductsCount?startDate={{startFormatDate}}&endDate={{endFormatDate}}">品牌产品数</a>
                 <a ng-href="#/categoryNumber?startDate={{startFormatDate}}&endDate={{endFormatDate}}">品类产品数</a>
             </span>
+            <span ng-if="!startFormatDate">
+                <a ng-href="#/merchantProducts">商家产品数</a>
+                <a ng-href="#/brandProductsCount">品牌产品数</a>
+                <a ng-href="#/categoryNumber">品类产品数</a>
+            </span>
         </div>
         <div class="form-item">
             <span class="item-title">更多操作：</span>

src/main/webapp/resources/view/admin/store_application_maintenance.html

@@ -277,6 +277,7 @@
 				<td>
 					<p ng-if="application.status == authType.PASS.name">已通过</p>
 					<p class="wait" ng-if="application.status == authType.PREPARE.name">待审核</p>
+					<p class="wait" ng-if="application.status == authType.CHECK.name">已通过初审</p>
 					<p class="no-pass" ng-if="application.status == authType.UNPASS.name">未通过</p>
 				</td>
 				<td>
@@ -286,8 +287,9 @@
 					</div>
 					<div ng-if="application.status === 'CHECK'">
 						<a class="apply-bg btn" href="javascript:void(0)" ng-click="auditQualification(application)">终审</a><br/>
+						<span style="color: #9d9d9d">已初审 {{application.time.day}}天{{application.time.hour}}时</span>
 					</div>
-					<div ng-if="application.status !== 'PREPARE'">
+					<div ng-if="application.status === 'PASS' || application.status === 'UNPASS'">
 						<a class="detail-bg btn" href="javascript:void(0)" ng-click="auditQualification(application)">查看详情</a>
 					</div>
 				</td>

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

@@ -201,7 +201,7 @@
             </ul>
           </div>
           <div class="fl textinput" ng-show="showProductInfo">
-            {{Regul.pbranden}}
+            {{Regul.pbranden || '-'}}
           </div>
         </div>
         <div class="clearfix w50 fl list">
@@ -218,7 +218,7 @@
             />
           </div>
           <div class="fl textinput" ng-show="showProductInfo">
-            {{Regul.kind}}
+            {{Regul.kind || '-'}}
           </div>
         </div>
         <div class="clearfix w50 fl list">
@@ -241,7 +241,7 @@
             </ul>
           </div>
           <div class="fl textinput" ng-show="showProductInfo">
-            {{Regul.kind}}
+            {{Regul.kind || '-'}}
           </div>
         </div>
         <div class="clearfix w50 fl list">
@@ -256,7 +256,7 @@
                    class="form-control inputText" maxlength="50"/>
           </div>
           <div class="fl textinput" ng-show="showProductInfo">
-            {{Regul.spec}}
+            {{Regul.spec || '-'}}
           </div>
         </div>
         <div class="clearfix w50 fl list">
@@ -269,7 +269,7 @@
             </select>
           </div>
           <div class="fl textinput" ng-show="showProductInfo">
-            {{Regul.packaging}}
+            {{Regul.packaging || '-'}}
           </div>
         </div>
         <div class="clearfix w50 fl list">
@@ -289,7 +289,7 @@
             />
           </div>
           <div class="fl textinput" ng-show="showProductInfo">
-            {{Regul.minPackQty}}
+            {{Regul.minPackQty || '-'}}
           </div>
         </div>
         <div class="clearfix w50 fl list">
@@ -306,7 +306,7 @@
                    ng-class="objError.reserve ? 'danger' : '' "/>
           </div>
           <div class="fl textinput" ng-show="showProductInfo">
-            {{Regul.reserve}}
+            {{Regul.reserve || '-'}}
           </div>
         </div>
         <div class="clearfix w50 fl list">
@@ -325,7 +325,7 @@
             />
           </div>
           <div class="fl textinput" ng-show="showProductInfo">
-            {{Regul.OnePrice}}
+            {{Regul.OnePrice || '-'}}
           </div>
         </div>
         <div class="clearfix w50 fl list">
@@ -400,7 +400,7 @@
               />
             </div>
             <div class="fl textinput" ng-show="showProductInfo">
-              {{Regul.minBuyQty}}
+              {{Regul.minBuyQty || '-'}}
             </div>
           </div>
           <div class="clearfix marginBottom14">
@@ -471,14 +471,14 @@
                 <span class="fl w50" style="width: 50%;border-right:1px solid #dcdcdc" ng-show="!showProductInfo">
                   <input text="text" style="width: 100%;outline: 0;border: 0;text-align: center;height: 30px" maxlength="9" ng-disabled="$index === 0" ng-readonly="$index === 0" ng-model="price.start" ng-blur="productPriceInfoBlur($index, price.start)" />
                 </span>
-                <span class="fl w50" ng-show="showProductInfo">
-                  {{price.start}}
+                <span class="fl w50" style="text-align: center;border-right:1px solid #dcdcdc" ng-show="showProductInfo">
+                  {{price.start}}+
                 </span>
                 <span class="fl w50" style="width: 50%" ng-show="!showProductInfo">
                   <input ng-show="storeInfo.enType !== 'HK'" type="text" autocomplete="off" validata-price ng-blur="changePrices(Regul.prices, price.rMBPrice, $index)" oninput="if(value.length>11)value=value.slice(0,11)" style="width: 100%;outline: 0;border: 0;text-align: center;height: 30px" ng-model="price.rMBPrice" />
                   <input ng-show="storeInfo.enType === 'HK'" type="text" autocomplete="off" validata-price ng-blur="changePrices(Regul.prices, price.uSDPrice, $index)" oninput="if(value.length>11)value=value.slice(0,11)" style="width: 100%;outline: 0;border: 0;text-align: center;height: 30px" ng-model="price.uSDPrice" />
                 </span>
-                <span class="fl w50" ng-show="showProductInfo">
+                <span class="fl w50" ng-show="showProductInfo" style="text-align: center">
                   {{price.rMBPrice || price.uSDPrice}}
                 </span>
                 <div style="clear:both"></div>

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

@@ -751,8 +751,8 @@
                         </td>
                         <td>
                             <div ng-repeat="price in commodity.prices">
-                                <span ng-if="$$upAndDown.currency == 'RMB'" style="margin-left: 20px;" ng-bind="price.rMBPrice | formateNumber : 6 | currencySysmbol : $$upAndDown.currency">0.52</span>
-                                <span ng-if="$$upAndDown.currency == 'USD'" style="margin-left: 20px;" ng-bind="price.uSDPrice | formateNumber : 6 | currencySysmbol : $$upAndDown.currency">0.52</span>
+                                <span ng-if="$$upAndDown.currency == 'RMB'" class="wid100" style="margin-left: 0px;" ng-bind="price.rMBPrice | formateNumber : 6 | currencySysmbol : $$upAndDown.currency">0.52</span>
+                                <span ng-if="$$upAndDown.currency == 'USD'"  class="wid100"  style="margin-left: 0px;" ng-bind="price.uSDPrice | formateNumber : 6 | currencySysmbol : $$upAndDown.currency">0.52</span>
                             </div>
                         </td>
                         <td>
@@ -766,8 +766,10 @@
                             </div>
                         </td>
                         <td>
-                            <div>
-                                <span class="wid100" ng-bind="commodity.operater.userName"></span>
+                            <div title="{{commodity.operater.userName}}">
+                                <span class="wid100" style="width: 64px;overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;" ng-bind="commodity.operater.userName"></span>
                             </div>
                         </td>
                     </tr>