Merge branch 'fix' into feature-201815-liusw

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

@@ -145,6 +145,8 @@
 					class="fa fa-shopping-cart"></i><span> 标准器件批量建档维护</span></a></li>
 			<li class="nav-node"><a href="#audit/componentMaintenance"><i
 					class="fa fa-shopping-cart"></i><span> 标准器件维护</span></a></li>
+			<li class="nav-node"><a href="#audit/RegulpicList"><i
+					class="fa fa-shopping-cart"></i><span> 规格书审核</span></a></li>
 			<li class="nav-node"><a href="#audit/kindContrast"><i
 					class="fa fa-shopping-cart"></i><span> 属性对应关系维护</span></a></li>
 			<li class="nav-node"><a href="#audit/crawlTask"><i

src/main/webapp/resources/css/common.css

@@ -403,7 +403,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 .modal-open .modal {
     overflow-x: hidden;
     overflow-y: hidden;
-		z-index: 1000000 !important;
+		z-index: 999995 !important;
 }
 
 

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

@@ -352,7 +352,13 @@
 			templateUrl : 'static/view/admin/audit_component.html',
 			controller : 'AuditComponentCtrl',
 			controllerUrl : 'app/controllers/AuditComponentCtrl'
-		})).state('audit_component_detail', angularAMD.route({
+		})).state('audit_regulplist', angularAMD.route({
+      // 规格书审核
+      url: '/audit/RegulpicList',
+      templateUrl : 'static/view/admin/RegulpicList.html',
+      controller : 'AuditRegulpicListCtrl',
+      controllerUrl : 'app/controllers/AuditRegulpicListCtrl'
+    })).state('audit_component_detail', angularAMD.route({
 			// 品牌审批详细页面
 			url: '/audit/component/:id',
 			templateUrl : 'static/view/admin/audit_component_detail.html',

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

@@ -0,0 +1,131 @@
+define([ 'app/app' ], function(app) {
+  //品牌审批
+  app.register.controller('AuditRegulpicListCtrl', ['$scope', '$anchorScroll', '$location', '$modal', 'BaseService', 'SessionService', 'toaster', 'ngTableParams', 'StoreInfo', 'StoreCms', '$state', function ($scope, $anchorScroll, $location, $modal, BaseService, SessionService, toaster, ngTableParams, StoreInfo, StoreCms, $state) {
+
+    $scope.storeType = 'ALL';
+    $scope.isShow = 'ALL';
+
+    $scope.storeTableParams = new ngTableParams({
+      page : 1,
+      count : 10,
+      sorting : {
+        updateTime : 'DESC'
+      }
+    }, {
+      total : 0,
+      counts: [5, 10, 25, 50, 100],
+      getData : function($defer, params) {
+        $scope.loading = true;
+        var param = BaseService.parseParams(params.url());
+
+        // 过滤店铺类型
+        if ($scope.storeType && $scope.storeType !== '' && $scope.storeType !== 'ALL') {
+          param.type = $scope.storeType;
+        }
+
+        // 过滤店铺状态信息
+        if ($scope.storeStatus && $scope.storeStatus !== '') {
+          param.status = $scope.storeStatus;
+        }
+
+        // 根据关键字进行搜索
+        if ($scope.keyword && $scope.keyword !== '') {
+          param.keyword = $scope.keyword;
+        }
+
+        StoreInfo.pageStoreInfoWhenAdminQuery(param, function (data) {
+          if (!data.content || !Array.isArray(data.content)) {
+            data.content = [];
+          }
+          angular.forEach(data.content, function (store) {
+            var tags = JSON.parse(store.tags || '[]');
+            store.tagsObject = {};
+            for (var i = 0; i < tags.length; i++) {
+              store.tagsObject[tags[i]] = true;
+            }
+          });
+          $defer.resolve(data.content);
+          params.total(data.totalElements);
+          console.log(data);
+        });
+      }
+    });
+
+    $scope.newStoreMap = {};
+
+
+    /**
+     * 根据关键字进行搜索
+     */
+    $scope.refreshTableData = function () {
+      $scope.storeTableParams.page(1);
+      $scope.storeTableParams.reload();
+    };
+
+    /**
+     * 通过
+     */
+    $scope.passBtnFn = function() {}
+
+    /**
+    * 不通过
+    */
+    $scope.cancelBtnFn = auditUnpass
+
+
+    /**
+     * 审核未通过开铺申请
+     */
+    function auditUnpass(list) {
+      openReasonModal().then(function (reason) {
+        NopassAudit(list, reason)
+      }, function (error) {
+        console.log(error);
+      });
+    }
+    /**
+     * 打开审核不通过原因模态框
+     */
+    function openReasonModal() {
+      return $modal.open({
+        templateUrl: 'static/view/admin/modal/auditRegulpic_modal.html',
+        controller: 'auditRegulpicController',
+        size : 'md'
+      }).result;
+    }
+
+    /**
+     * 审核不通过
+     */
+    function NopassAudit(list, reason) {
+
+    }
+  }]);
+
+  /**
+   * 审核不通过模态框控制器
+   */
+  app.register.controller('auditRegulpicController', ['$scope', '$modalInstance', 'toaster', function ($scope, $modalInstance, toaster) {
+    $scope.saveReason = saveReason;
+    $scope.dismiss = dismiss;
+    $scope.reason = null;
+
+    /**
+     * 保存不通过原因
+     */
+    function saveReason() {
+      if (!$scope.reason || $scope.reason === '') {
+        toaster.pop('error', '请填写审核不通过原因');
+        return ;
+      }
+      $modalInstance.close($scope.reason);
+    }
+
+    /**
+     * 关闭模态框
+     */
+    function dismiss() {
+      $modalInstance.dismiss();
+    }
+  }]);
+});

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

@@ -1137,5 +1137,27 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 		}
 	}]);
 
+  // 上传规格书
+  app.controller('editRegulationCtrl', ['$scope', 'Regulpic', '$modalInstance','showAction', function ($scope, Regulpic, $modalInstance, showAction) {
+    $scope.Regulpic = Regulpic;
+    $scope.showAction = showAction
+    $scope.cancel = function () {
+      $modalInstance.close();
+    };
+
+    // 删除已上传图片
+    $scope.deleteImg = function () {
+      $scope.Regulpic = 'static/img/store/common/default.png'
+    }
+
+    // 图片上传成功之后
+    $scope.onUploadSuccess = function(data){
+      $scope.Regulpic = data.path;
+    };
+
+    $scope.confirm = function() {
+      $modalInstance.close($scope.Regulpic);
+    }
+  }]);
 	return app;
 });

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

@@ -3032,6 +3032,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
     $scope.activeIndex = -1;
     // 编辑
     $scope.setActiveIndex = function(index, material) {
+      $scope.setShowActive = -1;
       $scope.errorObj = [];
       $scope.isInCodeList = [];
       $scope.isInBrandList = [];
@@ -3405,6 +3406,32 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
         $scope.ngLastFinished = false
       }
     })
+
+    /**
+     * 修改规格书
+     */
+    $scope.editRegulPicture = function(Regulpic, commodity) {
+      var modalInstance = $modal.open({
+        templateUrl : 'static/view/vendor/modal/edit_regul_modal.html',
+        size : 'md',
+        controller : 'editRegulationCtrl',
+        resolve : {
+          Regulpic : function() {
+            return Regulpic;
+          },
+          showAction : function() {
+            return true;
+          }
+        }
+      });
+      modalInstance.result.then(function (Regulpic) {
+        if(Regulpic) {
+          commodity.Regulpic = Regulpic;
+        }
+      }, function() {
+
+      });
+    }
   }]);
 
 	//类目选择模态框
@@ -3611,4 +3638,6 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 			}
         };
 	}]);
+
+
 });

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

@@ -1916,6 +1916,11 @@ define([ 'app/app' ], function(app) {
         $modalInstance.close();
       };
 
+      // 删除已上传图片
+      $scope.deleteImg = function () {
+        $scope.Regulpic = 'static/img/store/common/default.png'
+      }
+
       // 图片上传成功之后
       $scope.onUploadSuccess = function(data){
         $scope.Regulpic = data.path;

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

@@ -0,0 +1,313 @@
+<style>
+  #store-list .table tr>th,
+  #store-list .table tr>td{
+    text-align: center;
+    vertical-align: middle;
+  }
+
+  #store-list table td .info-line {
+    white-space: nowrap;
+  }
+  /*切换导航*/
+  .menu .col-sm-8{
+    padding: 0;
+    width: auto;
+  }
+  .menu{
+    width: 100%;
+    height: 40px;
+    background: #229ee6;
+    margin: 0;
+    line-height: 40px;
+    overflow: hidden;
+  }
+  .menu .btn{
+    border: none;
+    background: none;
+    color: #fff;
+    padding: 8px 30px;
+    min-width: 100px;
+  }
+
+  .menu2{
+    background: #fff;
+    border-bottom: 1px solid #229ee6
+  }
+  .menu2 .btn{
+    color: #333;
+  }
+  .menu .btn:active{
+    background: none;
+    box-shadow: inset 0 0 0 rgba(0,0,0,0.125);
+    border:0;
+  }
+  .menu2 .btn:active{
+    color: #333;
+  }
+  .menu .btn-group{
+    height: 40px;
+  }
+  .menu .btn-primary:before,.menu a:hover:before{
+    content: "";
+    width: 20px;
+    height: 20px;
+    display: inline-block;
+    background: #fff;
+    transform: rotate(-45deg);
+    position: absolute;
+    bottom: -18px;
+    left: 40%;
+  }
+  .menu2 .btn-primary{
+    border-bottom: 3px solid #219ee6;
+    color: #219ee6
+  }
+  .menu2 .btn:hover {
+    border-bottom: 3px solid #219ee6;
+    color: #219ee6
+  }
+  .menu2 .btn-primary:before,.menu2 a:hover:before{
+    content: '';
+    background: rgba(0,0,0,0);
+  }
+  .menu .col-sm-3{
+    float: right;
+    margin-right: 100px;
+    width: 270px;
+    padding: 0;
+  }
+  .menu .sreach-input{
+    position: relative;
+    margin-top: 5px;
+    width: 270px;
+    height: 40px;
+  }
+  .menu .sreach-input .form-control{
+    height: 30px;
+    float: left;
+    border-radius: 0;
+    font-size: 12px;
+  }
+  .menu .sreach-input button{
+    width: 60px;
+    height: 30px;
+    background: #b9e1f9;
+    float: right;
+    position: absolute;
+    right: 0;
+    top: 0;
+    border: none;
+    font-size: 14px;
+  }
+  .com-title h2{
+    font-size: 24px;
+    color: #219ee6;
+  }
+  /*显示记录条数*/
+  .text-rt{
+    text-align: right;
+  }
+  .record-stort{
+    line-height: 34px;
+    font-size: 12px;
+    margin-bottom: 0;
+    padding-right: 30px;
+  }
+  .record-stort em{
+    font-family: "Microsoft Yahei", "微软雅黑";
+    color: #229ee6;
+    font-style: inherit;
+    font-weight: inherit;
+    background: none;
+  }
+  /*表格样式*/
+  .application-tab table tbody tr{
+    height: 70px;
+  }
+  .application-tab table tr th,.application-tab table tr td{
+    border: #cfedfe 1px solid;
+    text-align: center;
+    vertical-align: middle;
+  }
+  .application-tab .table-bordered{
+    border-top: #cfedfe 1px solid;
+  }
+  .application-tab table tr th{
+    background: #cfedfe;
+    height: 35px;
+  }
+  .application-tab table tbody tr:hover{
+    background: #e4f3fc;
+  }
+  .application-tab table tbody tr .btn{
+    border: none;
+    width: 60px;
+    height: 22px;
+    line-height: 22px;
+    color: #fff;
+    display: inline-block;
+    margin-bottom: 5px;
+    padding: 0;
+    font-size: 12px;
+    border-radius: 2px;
+  }
+  .text-left{
+    text-align: left !important;
+  }
+  .application-tab table tbody tr .btn:hover{
+    background: #219ee6 ;
+  }
+  .application-tab table thead th p i{
+    color: #219ee6;
+    /*margin-left: 4px;*/
+  }
+  .application-tab table thead th p:hover{
+    cursor: pointer;
+  }
+  .application-tab table tr td p{
+    margin-bottom: 0;
+  }
+  .application-tab table tr td .passBtn {
+    width: 42px;
+    height: 22px;
+    line-height: 22px;
+    font-size: 12px;
+    text-align: center;
+    background: #3ba9e9;
+    color: #fff;
+    border-radius: 3px;
+    display: inline-block;
+    cursor: pointer;
+  }
+  .application-tab table tr td .passBtn:hover {
+    background: #3186b7
+  }
+  .application-tab table tr td .cancelBtn {
+    display: inline-block;
+    width: 42px;
+    height: 22px;
+    line-height: 22px;
+    font-size: 12px;
+    text-align: center;
+    background: #fff;
+    color: #3ba9e9;
+    border-radius: 3px;
+    border: 1px solid #3ba9e9;
+    cursor: pointer;
+  }
+  .application-tab table tr td .cancelBtn:hover {
+    background: #f02020;
+    color: #fff;
+    border: 1px solid #f02020;
+  }
+  .application-tab table tr td .lookNoPassInfo {
+    position: relative;
+  }
+
+  .application-tab table tr td .lookNoPassInfo .infoMore {
+    display: none;
+    width: 178px;
+    min-height: 50px;
+    padding: 5px;
+    position: absolute;
+    left: -36px;
+    top: 22px;
+    border: 1px solid #219ee6;
+    box-shadow: 0 0 2px #219ee6;
+    background: #fff;
+  }
+  .application-tab table tr td .lookNoPassInfo:hover .infoMore{
+    display: block;
+  }
+</style>
+<div class="row-fluid sortable" id="store-list">
+  <div class="com-title">
+    <h2>规格书审核</h2>
+  </div>
+  <div class="menu row">
+    <div class="col-sm-8">
+      <div class="btn-group" role="group" aria-label="...">
+        <a type="button" class="btn btn-default" ui-sref="audit_component">标准器件审批</a>
+        <a type="button" class="btn btn-default btn-primary">规格书审核</a>
+        <!--<a type="button" class="btn btn-default" ng-class="{'btn-primary': storeType === 'ALL'}" ng-click="chooseStoreType('ALL')">全部</a>-->
+        <!--<a type="button" class="btn btn-default" ng-class="{'btn-primary': storeType === 'ORIGINAL_FACTORY'}" ng-click="chooseStoreType('ORIGINAL_FACTORY')">待审核</a>-->
+        <!--<a type="button" class="btn btn-default" ng-class="{'btn-primary': storeType === 'AGENCY'}" ng-click="chooseStoreType('AGENCY')">已通过</a>-->
+        <!--<a type="button" class="btn btn-default" ng-class="{'btn-primary': storeType === 'DISTRIBUTION'}" ng-click="chooseStoreType('DISTRIBUTION')">未通过</a>-->
+      </div>
+    </div>
+    <div class="col-sm-3">
+      <div class="sreach-input">
+        <input type="search" class="form-control" placeholder="请输入公司名称" ng-model="keyword" ng-search="refreshTableData()"/>
+        <button ng-click="refreshTableData()">搜索</button>
+      </div>
+    </div>
+  </div>
+  <div class="row menu menu2">
+    <div class="col-sm-8">
+      <div class="btn-group" role="group" aria-label="...">
+        <a type="button" class="btn btn-default" ng-class="{'btn-primary': storeType === 'ALL'}" ng-click="chooseStoreType('ALL')">全部</a>
+        <a type="button" class="btn btn-default" ng-class="{'btn-primary': storeType === 'ORIGINAL_FACTORY'}" ng-click="chooseStoreType('ORIGINAL_FACTORY')">待审核</a>
+        <a type="button" class="btn btn-default" ng-class="{'btn-primary': storeType === 'AGENCY'}" ng-click="chooseStoreType('AGENCY')">已通过</a>
+        <a type="button" class="btn btn-default" ng-class="{'btn-primary': storeType === 'DISTRIBUTION'}" ng-click="chooseStoreType('DISTRIBUTION')">未通过</a>
+      </div>
+    </div>
+    <div class="col-sm-3">
+    </div>
+  </div>
+  <div class="row">
+    <div class="text-rt col-sm-12">
+      <p class="record-stort">显示1-10条记录，&nbsp;&nbsp;共<em ng-bind="storeTableParams.total()">1000</em>条</p>
+    </div>
+  </div>
+  <!--表格-->
+  <div class="application-tab">
+    <table class="table table-bordered" ng-table="storeTableParams">
+      <thead>
+      <tr>
+        <th width="154">提交人</th>
+        <th width="94">提交时间</th>
+        <th width="148">品牌</th>
+        <th width="147">物料(类目名称)</th>
+        <th width="146">型号</th>
+        <th width="74">规格书</th>
+        <th width="98">审核人</th>
+        <th width="94">审核时间</th>
+        <th width="106">状态</th>
+        <th width="114">操作</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr ng-repeat="list in $data">
+        <td>
+          <div>呼哈哈</div>
+          <div>深圳市优软科技</div>
+        </td>
+        <td><span ng-bind="list.createTime | date : 'yyyy-MM-dd HH:mm:ss'"></span></td>
+        <td>品牌</td>
+        <td>物料(类目名称)</td>
+        <td>型号</td>
+        <td><a href="{{list}}" target="_blank"><img src="static/img/vendor/images/pdf.png" style="width:31px;height:35px;" /></a></td>
+        <td>审核人</td>
+        <td><span ng-bind="list.createTime | date : 'yyyy-MM-dd HH:mm:ss'"></span></td>
+        <td>
+          <!--<span style="color: #219ee6">待审核</span>-->
+          <!--<span style="color: #666">已通过</span>-->
+          <div class="lookNoPassInfo">
+            <span style="color: #f02020">未通过<img src="static/img/vendor/images/nofireinfo_icon.png" width="16" height="16" /></span>
+            <div class="infoMore">
+              <span style="color:#219ee6">原因：</span>就是不想让你通过。
+            </div>
+          </div>
+        </td>
+        <td>
+          <span class="passBtn" ng-click="passBtnFn()">通过</span>
+          <span class="cancelBtn" ng-click="cancelBtnFn(list)">不通过</span>
+        </td>
+      </tr>
+      <tr ng-if="!$data || $data.length <= 0">
+        <td colspan="8">暂时没有待审核申请</td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+</div>

src/main/webapp/resources/view/admin/modal/auditRegulpic_modal.html

@@ -0,0 +1,49 @@
+<style type="text/css">
+  h3.modal-title {
+    font-size: 17px;
+    line-height: 1;
+    color: #fff;
+  }
+
+  #body {
+    padding-left: 10px;
+    padding-right: 10px;
+    font-size: 15px;
+  }
+
+  div.title {
+    background-color: #3ba9e9;
+  }
+
+  #body . {
+    margin-bottom: 10px;
+  }
+
+  .close {
+    font-size: 22px;
+  }
+  [class^="span"] {
+    width: auto;
+  }
+</style>
+<div class="modal-header title">
+  <button type="button" class="close" ng-click="dismiss()"><span>×</span></button>
+  <h3 class="modal-title">不通过原因</h3>
+</div>
+<form class="form-horizontal " name="myForm" novalidate>
+  <div class="modal-body" id="body">
+    <div class="form-group">
+      <div class="col-sm-12">
+        <textarea class="form-control" id="reason" title="reason" rows="10" ng-model="reason"></textarea>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-6">
+        <input class="btn btn-primary" type="button" value="确定" ng-click="saveReason()" style="float: right;"/>
+      </div>
+      <div class="col-sm-6">
+        <input class="btn btn-default" type="button" value="取消" ng-click="dismiss()"/>
+      </div>
+    </div>
+  </div>
+</form>

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

@@ -341,7 +341,7 @@
 		color: #5078cb;
 	}
 	.pro_management .table .check-active {
-		margin-right: 15px;
+		/*margin-right: 15px;*/
 		user-select: none;
 	}
 	.pro_management .table .check-active span {
@@ -1941,6 +1941,29 @@
 		font-size: 14px;
 		color: #f60e0e;
 	}
+	.Regulpic img {
+		width: 24px;
+		height: 27px;
+	}
+	div.forAdminLook {
+		margin: 0 auto;
+		width: 70px;
+		height: 25px;
+		color: #333;
+		font-size: 14px;
+		border: 1px solid #5078cb;
+		border-radius: 3px;
+		text-align: center;
+		line-height: 25px;
+		margin-top: 4px;
+		position: absolute;
+		background: #fff;
+		display: none
+	}
+	.ToforAdminLook:hover .forAdminLook {
+		display: block;
+	}
+
 </style>
 <div class="user_right fr">
 	<!--货品管理-->
@@ -2007,19 +2030,19 @@
 				<table class="public-tab standard-tab table">
 					<thead>
 					<tr>
-						<th width="65">
+						<th width="55">
 							<label class="check-active">
 								<input ng-disabled="currenctMaterial.length == 0" type="checkbox"  ng-click="chooseAllItem()" ng-checked="chooseAll || chooseAllPage" id="AllChoose"/>
 								<label for="AllChoose"></label>
 								<span>全选</span>
 							</label>
 						</th>
-						<th width="40">序号</th>
 						<th width="120">品牌</th>
-						<th width="140">物料名称(类目)</th>
-						<th width="170">型号</th>
+						<th width="130">物料名称(类目)</th>
+						<th width="150">型号</th>
 						<th width="100">规格</th>
-						<th width="80">单位</th>
+						<th width="100">规格书</th>
+						<th width="60">单位</th>
 						<!--<th width="80">封装</th>-->
 						<th width="280">操作</th>
 					</tr>
@@ -2058,10 +2081,10 @@
 							<img src="static/img/vendor/images/person-material-pc.png" ng-if="material.addProductPerson" alt="">
 							<span><input type="checkbox" ng-checked="material.isChoosed"  ng-click="chooseOne(material)"  id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>
 						</td>
-						<td>
+						<!--<td>-->
 							<!--<span ng-show="isBatch"><input type="checkbox" ng-checked="material.isChoosed"  ng-click="chooseOne(material)"  id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>-->
-							<span ng-show="!isBatch" ng-bind="(param.page - 1) * 10 + $index + 1"></span>
-						</td>
+							<!--<span ng-show="!isBatch" ng-bind="(param.page - 1) * 10 + $index + 1"></span>-->
+						<!--</td>-->
 						<td>
 							<div class="ellipsis-div" ng-if="material.pbranden" ng-bind="material.pbranden" title="{{material.pbranden}}"></div>
 							<div class="ellipsis-div" ng-if="!material.pbranden" ng-bind="material.pbrand" title="{{material.pbrand}}"></div>
@@ -2077,13 +2100,36 @@
 						<td>
 							<span ng-bind="material.spec || '-'" title="{{material.spec || '-'}}"></span>
 						</td>
+						<td style="overflow: initial;">
+							<div class="Regulpic">
+								<a href="{{goods.Regulpic}}" target="_blank" ng-if="goods.Regulpic" class="Regulpica">
+									<span style="cursor: pointer;">
+										<img style="width:24px;height:26px;border: 0px" src="static/img/vendor/images/pdf.png"/>
+										<div style="position: relative;display: inline-block" class="ToforAdminLook">
+											<img src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;"/>
+											<div class="forAdminLook">待审核</div>
+										</div>
+									</span>
+								</a>
+								<div ng-if="!goods.Regulpic">
+									-
+								</div>
+							</div>
+						</td>
 						<td ng-bind="material.unit || 'PCS'" title="{{material.unit  || 'PCS'}}"></td>
 						<!--<td>-->
 							<!--<span ng-bind="material.encapsulation || '-'" title="{{material.encapsulation || '-'}}"></span>-->
 						<!--</td>-->
 						<td class="edit">
-							<span ng-click="lookActiveIndex($index, material)"><span>查看</span></span>/<span ng-click="setActiveIndex($index,material)"><span>编辑可替代型号</span></span>
+							<span ng-click="lookActiveIndex($index, material)">
+								<span>可替代型号</span>
+								<!--<span>查看</span></span>/<span ng-click="setActiveIndex($index,material)"><span>编辑可替代型号</span>-->
+						  </span>
 							<span name="delete-material" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="deleteMaterial(material)"><span>删除</span></span>
+							<span ng-click="editRegulPicture(goods.Regulpic || 'static/img/store/common/default.png', goods)">
+								<span>编辑物料</span>
+							</span>
+							<!---->
 							<span ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="showShelfArea(material)">
 								<span ng-if="material.batchCount">添加产品</span>
 								<span ng-if="!material.batchCount">编辑上架</span>
@@ -2201,6 +2247,7 @@
                                                         </div>
                                                     </div>
                                                     <div class="content floatLeft">
+																											<div class="">
                                                         <p class="title height29">交期(天)：</p>
                                                         <div class="input-list">
                                                             <p>
@@ -2213,6 +2260,9 @@
                                                                              ng-class="{'error' : goods.editMaxDeliveryinValid}"/></span>
                                                             </p>
                                                         </div>
+																												<div style="clear:both"></div>
+																											</div>
+
                                                     </div>
                                                     <div class="content margin10">
                                                         <!--<p class="title">自营 / 寄售</p>-->
@@ -2666,6 +2716,7 @@
 
 		<div class="reminfo" style="background: #fff;text-align: right;margin: 0px;padding-right: 20px;padding-top:5px;padding-bottom: 10px" ng-if="resultDatalist.length > 0">共<span style="color: #5078cb">{{resultDatalist.length}}</span>个可替代型号</div>
     <div class="operate">
+			<span ng-if="resultDatalist.length >= 0" ng-click="setActiveIndex(setShowActive, _material)">编辑</span>
       <span ng-click="lookActiveIndex(-1)" style="background: #5078cb">关闭</span>
     </div>
   </div>
@@ -2925,6 +2976,13 @@
 		.edit-replace-box .content3 .no-resulte a:hover {
 			text-decoration: underline !important;
 		}
+		.device .wanted_list01 a.Regulpica:hover {
+			text-decoration: none;
+			border-bottom: 0 !important;
+		}
+		.Regulpica:hover span{
+			background: rgba(0,0,0,0) !important;
+		}
 </style>
 
 <!--

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

@@ -951,6 +951,39 @@
     .wanted_list01 .tab table tr {
         height: 104px;
     }
+    .Regulpic img {
+        width: 24px;
+        height: 27px;
+    }
+    .edit-form td div.forAdminLook {
+        width: 70px;
+        height: 25px;
+        color: #333;
+        font-size: 14px;
+        border: 1px solid #5078cb;
+        border-radius: 3px;
+        text-align: center;
+        margin-top: 4px;
+    }
+    div.forAdminLook {
+        margin: 0 auto;
+        width: 70px;
+        height: 25px;
+        color: #333;
+        font-size: 14px;
+        border: 1px solid #5078cb;
+        border-radius: 3px;
+        text-align: center;
+        line-height: 25px;
+        margin-top: 4px;
+        position: absolute;
+        background: #fff;
+        display: none
+    }
+    .ToforAdminLook:hover .forAdminLook {
+        display: block;
+    }
+
 </style>
 <div class="user_right fr">
     <!--货品管理-->
@@ -1146,15 +1179,27 @@
                                 <span title="{{price.rMBPrice | formateNumber : 6 | currencySysmbol : commodity.currencyName}}" ng-bind="price.rMBPrice | formateNumber : 6 | currencySysmbol : commodity.currencyName" class="marginL27"></span>
                             </div>
                         </td>
-                        <td>
-                            <div ng-if="onsale.currency == 'RMB'">
+                        <td style="overflow: inherit;">
+                            <div ng-if="onsale.currency == 'RMB'" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
                                 <span ng-if="commodity.b2cMaxDelivery && (commodity.b2cMaxDelivery != commodity.b2cMinDelivery)" ng-bind=" commodity.b2cMinDelivery + '-'+ commodity.b2cMaxDelivery" class="marginL40" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:60px;"></span>
                                 <span ng-if="commodity.b2cMaxDelivery && (commodity.b2cMaxDelivery == commodity.b2cMinDelivery)" ng-bind=" commodity.b2cMinDelivery" class="marginL40" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:60px;"></span>
                             </div>
-                            <div ng-if="onsale.currency == 'USD'">
+                            <div ng-if="onsale.currency == 'USD'" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
                                 <span ng-if="commodity.b2cMaxDelivery && (commodity.b2cMinDelivery != commodity.b2cMaxDelivery)" ng-bind=" commodity.b2cMinDelivery + '-'+ commodity.b2cMaxDelivery" class="marginL40"></span>
                                 <span ng-if="commodity.b2cMaxDelivery && (commodity.b2cMinDelivery == commodity.b2cMaxDelivery)" ng-bind=" commodity.b2cMinDelivery" class="marginL40"></span>
                             </div>
+                            <div class="Regulpic">
+                                <span>规格书:</span>
+                                <!--<span ng-if="!commodity.Regulpic">-</span>-->
+                                <div style="position: relative;display: inline-block;width: auto;margin-top: 0px" class="ToforAdminLook">
+                                    <a style="text-decoration: none;margin: 0px;border-bottom:0px" target="_blank" href="{{commodity.Regulpic}}" class="Regulpica">
+                                        <img style="width:24px;height:26px" src="static/img/vendor/images/pdf.png"/>
+                                    </a>
+                                    <img src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;"/>
+                                    <div class="forAdminLook">待审核</div>
+                                </div>
+                                <!--<div class="forAdminLook" style="margin-left: 35px;">待审核</div>-->
+                            </div>
                         </td>
                         <td>
                             <div>
@@ -1195,7 +1240,6 @@
                                             <a ng-click="commodity.editPic = null" class="delete-img" title="删除" ng-if="commodity.editPic"><i class="fa fa-trash"></i></a>
                                             <a ng-click="editGoodsPicture(commodity.editPic || 'static/img/store/common/default.png', commodity)" title="修改图片"><img src="static/img/icon/update-img.png" /></a>
                                         </div>
-                                        <!--<a ng-click="editRegulPicture(commodity.Regulpic || 'static/img/store/common/default.png', commodity)">规格书</a>-->
                                     </div>
                                     <div class="fr wid135">
                                         <p>品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></p>
@@ -1283,6 +1327,22 @@
                                         <span>-</span>
                                         <span><input type="text" placeholder="香港最长交期" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, true, commodity)" ng-model="commodity.editMaxDelivery" class="wid25 form-control" oninput="if(value.length>3)value=value.slice(0,3)"/></span>
                                     </div>
+                                    <div class="Regulpic">
+                                        <span>规格书:</span>
+                                        <div style="position: relative;display: inline-block;width: auto;margin-top: 0px" class="ToforAdminLook">
+                                            <a style="text-decoration: none;margin: 0px" target="_blank" href="{{commodity.Regulpic}}" class="Regulpica">
+                                                <img style="width:24px;height:26px" src="static/img/vendor/images/pdf.png"/>
+                                            </a>
+                                            <img src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;"/>
+                                            <div class="forAdminLook">待审核</div>
+                                        </div>
+                                    </div>
+                                    <!--<div class="Regulpic">-->
+                                        <!--<span>规格书:</span>-->
+                                        <!--<img style="width:24px;height:26px;cursor: pointer" src="static/img/vendor/images/pdf.png" ng-click="editRegulPicture(commodity.Regulpic || 'static/img/store/common/default.png', commodity)"/>-->
+                                        <!--<img src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;"/>-->
+                                        <!--<div class="forAdminLook">待审核</div>-->
+                                    <!--</div>-->
                                 </div>
                                 <div class="content-show width70">
                                     <div>
@@ -1603,6 +1663,9 @@
         position: relative;
         top: 7px;
     }
+    .device .wanted_list01 a.Regulpica:hover{
+        border-bottom: 0 !important;
+    }
 </style>
 <script>
     $(function(){

src/main/webapp/resources/view/vendor/modal/edit_regul_modal.html

@@ -24,6 +24,7 @@
     line-height: 256px;
     border: #e6e6e6 1px solid;
     margin-bottom: 5px;
+    position: relative;
   }
   .update-img .update-big-img .previewImage img{
     width: 256px;
@@ -136,38 +137,80 @@
     display: inline-block;
     margin-top: 5px;
   }
+  .cover {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0px;
+    top: 0px;
+    background: rgba(0,0,0,0.5);
+  }
+  .cover .fa-trash {
+    color: #fff;
+    font-size: 18px;
+    position: absolute;
+    right: 5px;
+    top: 5px;
+    cursor: pointer;
+  }
+  .cover .look {
+    position: absolute;
+    width: 120px;
+    height: 20px;
+    top: 50%;
+    margin-top: -10px;
+    margin-left: -60px;
+    left: 50%;
+    line-height: 26px;
+    text-align: center;
+    cursor: pointer;
+  }
+  .cover .look, .cover .fa-search {
+    color: #fff;
+    font-size: 14px
+  }
+  .cover .fa-search {
+    font-size: 16px;
+    margin-right: 3px;
+  }
 </style>
 <div class="modal-head"></div>
 <div class="modal-body">
   <div class="view-box">
     <div class="update-img">
       <a ng-click="cancel()" class="close">&times;</a>
+      <div ng-if="showAction">
+        <!-- 这里加上品牌类目型号规格编辑 -->
+        <div>品牌类目型号</div>
+      </div>
       <div class="update-big-img">
-        <p>大图预览</p>
+        <p>规格书上传</p>
         <div class="previewImage">
-          <a href="{{Regulpic}}" target="_blank" ng-if="Regulpic != ''"><img ng-src="{{Regulpic}}" alt="商品图片"></a>
+          <img ng-src="{{Regulpic}}" alt="商品图片">
           <img ng-src="{{Regulpic}}" alt="商品图片" ng-if="!Regulpic">
+          <div class="cover" style="background: rgba(0,0,0,0)">
+            <i class="fa fa-trash" style="z-index: 98" ng-click="deleteImg()"></i>
+          </div>
+          <a href="{{Regulpic}}" target="_blank" ng-if="Regulpic != 'static/img/store/common/default.png'">
+            <div class="cover">
+              <div class="look"><i class="fa fa-search"></i>查看</div>
+            </div>
+          </a>
         </div>
-        <span class="prompt"><em style="color: #f00;">*</em>  建议使用不小于256*256px图片，大小不超过3M</span>
+        <span class="prompt"><em style="color: #f00;">*</em>仅允许上传PDF格式文件，大小不超过20M</span>
       </div>
       <div class="update-file-btn">
         <div class="file-text">
-          <h3>图片上传须知</h3>
-          <div>上传的商品图片若存在以下任一情形，
-            平台将会对产品进行下架，若情节影响
-            严重，平台将保留追究权：<br/>
-            1、图片与产品不相符合；<br/>
-            2、图片存在低俗信息；<br/>
-            3、图片拼接、不清晰或拉伸变形等；<br/>
-            4、带有文字、色块、图形或logo等影响<br/>
-            &nbsp;&nbsp;&nbsp;主图美观和正常查看的内容（平台会<br/>
-            &nbsp;&nbsp;&nbsp;自动生成店铺logo，无需再使用有logo<br/>
-            &nbsp;&nbsp;&nbsp;的图片）.
+          <h3>规格书上传须知</h3>
+          <div>1、规格书上传后，商城会在两个工作日内进行审核，审核通过后规格书将会被展示在在售产品中；<br/>
+            2、当规格书处于<span>待审核</span>状态时，再次上传规格书，则前份规格书失效，需重新等待审核；<br/>
+            3、如审核不通过，将会以小心的形式通知您；<br/>
+            4、商城已收录规格书的器件暂不开放上传<br/>
           </div>
         </div>
         <p>
                         <span style="left:40px;">
-                            <input type="file" image-upload class="uploadImage" accept="image/jpeg,image/jpg,image/gif,image/bmp,image/png,.pdf" on-success="onUploadSuccess($data, $file)" non-preview="true">
+                            <input type="file" image-upload class="uploadImage" accept=".pdf" on-success="onUploadSuccess($data, $file)" non-preview="true">
                             <span>选择文件</span>
                         </span>
           <a ng-click="confirm()" class="ok">确定</a>