修改后台规格书管理

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

@@ -1,10 +1,9 @@
 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) {
+  app.register.controller('AuditRegulpicListCtrl', ['$scope', '$modal', 'BaseService', 'toaster', 'ngTableParams', 'StoreInfo', function ($scope, $modal, BaseService, toaster, ngTableParams, StoreInfo) {
 
     $scope.storeType = 'ALL';
     $scope.isShow = 'ALL';
-
     $scope.storeTableParams = new ngTableParams({
       page : 1,
       count : 10,
@@ -65,18 +64,18 @@ define([ 'app/app' ], function(app) {
     /**
      * 通过
      */
-    $scope.passBtnFn = function() {}
-
-    /**
-    * 不通过
-    */
-    $scope.cancelBtnFn = auditUnpass
-
+    $scope.passBtnFn = function(item) {
+      openPassModal(item).then(function (data) {
+        passAudit(data, item)
+      }, function (error) {
+        console.log(error);
+      });
+    }
 
     /**
      * 审核未通过开铺申请
      */
-    function auditUnpass(list) {
+    $scope.cancelBtnFn = function() {
       openReasonModal().then(function (reason) {
         NopassAudit(list, reason)
       }, function (error) {
@@ -95,11 +94,61 @@ define([ 'app/app' ], function(app) {
     }
 
     /**
-     * 审核不通过
+     * 审核不通过 回调
      */
     function NopassAudit(list, reason) {
 
     }
+
+    /**
+     * 审核通过 回调
+     */
+    function passAudit(data, item) {
+      // 是否需要打开规格书选择项
+      openRegulChooseModal(data, item).then(function (reason) {
+        // 刷新页面
+        $scope.storeTableParams.page(1);
+        $scope.storeTableParams.reload();
+      }, function (error) {
+        console.log(error);
+      });
+    }
+
+    /**
+     * 打开审核通过模态框
+     */
+    function openPassModal(item) {
+      return $modal.open({
+        templateUrl: 'static/view/admin/modal/auditRegulpicpass_modal.html',
+        controller: 'auditRegulpicpassController',
+        size : 'md',
+        resolve : {
+          item : function() {
+            return item;
+          }
+        }
+      }).result;
+    }
+
+
+    /**
+     * 打开规格书选择模态框
+     */
+    function openRegulChooseModal(data,item) {
+      return $modal.open({
+        templateUrl: 'static/view/admin/modal/auditRegulpic_choose_modal.html',
+        controller: 'auditRegulpicChooseController',
+        size : 'md',
+        resolve : {
+          item : function() {
+            return item;
+          },
+          responseData: function() {
+            return data;
+          }
+        }
+      }).result;
+    }
   }]);
 
   /**
@@ -128,4 +177,136 @@ define([ 'app/app' ], function(app) {
       $modalInstance.dismiss();
     }
   }]);
+
+  /**
+   * 审核通过模态框控制器
+   */
+  app.register.controller('auditRegulpicpassController', ['$scope', '$modalInstance', 'toaster', 'Commodity', 'Search','item', function ($scope, $modalInstance, toaster, Commodity, Search, item) {
+
+    $scope.kindPojo = {
+      first: '请选择一级类目',
+      second: '请选择二级类目',
+      third: '请选择三级类目'
+    }
+    $scope.saveReason = saveReason;
+    $scope.dismiss = dismiss;
+    $scope.BrandList = []
+    $scope.reason = null;
+    $scope.keyword = ''
+    $scope.spec = ''
+    $scope.item = item
+    /**
+     * 品牌联想词
+     */
+    $scope.onBrandChange = function(name) {
+      if (name === '') {
+        $scope.BrandList = []
+        return false
+      }
+      if ((/[^\x00-\xff]/g).test(name)) {
+        $scope.keyword = ''
+        $scope.BrandList = []
+        return false
+      }
+      $scope.BrandList = getSimilarBrands(name).$$state
+    }
+    /**
+     * 品牌联想词失去焦点
+     */
+    $scope.onBrandBlur = function(name) {
+      if (name === '') {
+        $scope.BrandList = []
+        return false
+      }
+    }
+    /**
+     * 保存不通过原因
+     */
+    function saveReason() {
+      if (!$scope.keyword || $scope.keyword === '') {
+        toaster.pop('error', '品牌未必填项');
+        return ;
+      }
+      if ($scope.kindPojo.first === '请选择一级类目') {
+        toaster.pop('error', '商城类目未选择');
+        return ;
+      }
+      if ($scope.kindPojo.second === '请选择二级类目') {
+        toaster.pop('error', '商城类目未选择');
+        return ;
+      }
+      if ($scope.kindPojo.third === '请选择三级类目') {
+        toaster.pop('error', '商城类目未选择');
+        return ;
+      }
+      // 申请品牌后，返回
+      $modalInstance.close({});
+    }
+    /**
+     * 选择品牌联想词
+     */
+    $scope.setBrand = function(item) {
+      $scope.keyword = item
+      $scope.BrandList = []
+    }
+
+    /**
+     * 关闭模态框
+     */
+    function dismiss() {
+      $modalInstance.dismiss();
+    }
+
+    var initKindDataInfo = function () {
+      Commodity.getAllKindInfo({}, function (data) {
+        $scope.kindInfo = data[0].children;
+      })
+    };
+    initKindDataInfo();
+
+    /**
+     * 获取品牌联想词
+     *
+     * @param name    品牌名称
+     */
+    function getSimilarBrands(name) {
+      if (name) {
+        return Search.getSimilarBrands({keyword: name}).$promise.then(
+            function (data) {
+              return data.map(function (item) {
+                return item;
+              });
+            });
+      }
+    }
+  }]);
+
+  /**
+   * 规格书选项
+   */
+  app.register.controller('auditRegulpicChooseController',['$scope', '$modalInstance', 'toaster', 'responseData', 'item', function($scope, $modalInstance, toaster, responseData, item) {
+    $scope.saveReason = saveReason;
+    $scope.dismiss = dismiss;
+    $scope.checked = 'store';
+
+    /**
+     * 保存不通过原因
+     */
+    function saveReason() {
+      // if (!$scope.reason || $scope.reason === '') {
+      //   toaster.pop('error', '请填写审核不通过原因');
+      //   return ;
+      // }
+      // 请求保存规格书接口
+      alert($scope.checked)
+      $modalInstance.close($scope.reason);
+    }
+
+    /**
+     * 关闭模态框
+     */
+    function dismiss() {
+      $modalInstance.dismiss();
+    }
+  }])
 });

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

@@ -3384,7 +3384,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
       var _wl = (angular.element('body').width() - angular.element('.edit-replace-box').width()) / 2
       var _bl = angular.element(window).height() * 0.2  + angular.element('.edit-replace-box .title').height()
       var Y = _bl + _hl + 28 - _scrollTop
-      if(type == 'brand') {
+      if(type == 'code') {
         X = _wl + $event.currentTarget.offsetLeft - 11
         el.css({
           right: X,

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

@@ -2806,11 +2806,12 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 
     function caleUllist($event,type,key,el){
       var _scrollTop = angular.element('.edit-replace-box .content').scrollTop()
+      var Y, X;
       var _hl = angular.element('.edit-replace-box .content .content-line')[key] ? angular.element('.edit-replace-box .content .content-line')[key].offsetTop : 0
       var _wl = (angular.element('body').width() - angular.element('.edit-replace-box').width()) / 2
       var _bl = angular.element(window).height() * 0.2  + angular.element('.edit-replace-box .title').height()
-      var Y = _bl + _hl + 28 - _scrollTop, X
-      if(type == 'brand') {
+      var Y = _bl + _hl + 28 - _scrollTop
+      if(type == 'code') {
         X = _wl + $event.currentTarget.offsetLeft - 11
         el.css({
           right: X,

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

@@ -300,7 +300,7 @@
           </div>
         </td>
         <td>
-          <span class="passBtn" ng-click="passBtnFn()">通过</span>
+          <span class="passBtn" ng-click="passBtnFn(list)">通过</span>
           <span class="cancelBtn" ng-click="cancelBtnFn(list)">不通过</span>
         </td>
       </tr>

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

@@ -1,6 +1,7 @@
 <div class="box">
 	<div class="box-header well" data-original-title>
-		<i class="icon-user"></i> 标准器件审批
+		<span style="color: #178acc"><i class="icon-user"></i> 标准器件审批</span>
+		<span ui-sref="audit_regulplist" style="cursor: pointer;"><i class="icon-user"></i> 规格书审核</span>
 	</div>
 	<div class="box-content">
 		<!-- ng-tableStart -->

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

@@ -0,0 +1,63 @@
+<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">
+        <p style="color: #ea0025">商城已存在该标准物料，请选择正确的规格书</p>
+      </div>
+    </div>
+    <div class="form-group" style="margin: 0px">
+      <div class="col-sm-6">
+        <label class="radio-inline">
+          <input type="radio" name="inlineRadioOptions" id="inlineRadio1" value="store" ng-checked="checked === 'store'" ng-click="checked = 'store'"> 商城规格书
+        </label>
+        <div style="margin: 10px 0"><img src="static/img/vendor/images/pdf.png" style="width:31px;height:35px;" /></div>
+      </div>
+      <div class="col-sm-6">
+        <label class="radio-inline">
+          <input type="radio" name="inlineRadioOptions" id="inlineRadio2" value="user"  ng-checked="checked === 'user'" ng-click="checked = 'user'"> 用户上传规格书
+        </label>
+        <div style="margin: 10px 0"><img src="static/img/vendor/images/pdf.png" style="width:31px;height:35px;" /></div>
+      </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/admin/modal/auditRegulpic_modal.html

@@ -34,7 +34,7 @@
   <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>
+        <textarea class="form-control" id="reason" title="reason" rows="10" ng-model="reason" placeholder="请填写不通过原因(必填)"></textarea>
       </div>
     </div>
     <div class="form-group">

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

@@ -0,0 +1,135 @@
+<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;
+  }
+  .form-horizontal .form-group {
+    line-height: 28px;
+  }
+  .form-horizontal div {
+    color: #666;
+    font-size: 14px
+  }
+  .form-horizontal .name {
+    color: #999
+  }
+  .listUl {
+    position: absolute;
+    top: 28px;
+    left: 15px;
+    width: 240px;
+    max-height: 180px;
+    overflow-y: auto;
+    background: #fff;
+    border: 1px solid #dcdcdc;
+    z-index: 10;
+  }
+  .listUl li {
+    font-size: 14px;
+    color: #666;
+    line-height: 24px;
+    text-indent: 12px;
+  }
+  .listUl li:hover {
+    background: #dcdcdc;
+    cursor: pointer;
+  }
+</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" style="padding: 0px 15px;">
+    <div class="form-group">
+      <div class="col-sm-3 name">品牌：</div>
+      <div class="col-sm-9">这是品牌名字</div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-3 name">物料名称(类目)：</div>
+      <div class="col-sm-9">这是物料名称</div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-3 name">型号：</div>
+      <div class="col-sm-9">这是型号名字</div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-3 name">规格书：</div>
+      <div class="col-sm-9"><a href="" target="_blank"><img src="static/img/vendor/images/pdf.png" style="width:28px;height:28px;"/></a></div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-3 name"><em style="color: #ea0e0e">*</em>品牌：</div>
+      <div class="col-sm-9" style="position: relative;">
+        <input type="text" ng-blur="onBrandBlur(keyword)"  ng-change="onBrandChange(keyword)" placeholder="请输入品牌名字" ng-model="keyword" class="form-control" style="width: 240px;height: 28px" />
+        <ul class="listUl" ng-if="BrandList.value.length > 0">
+          <li ng-repeat="item in BrandList.value" ng-click="setBrand(item.nameEn)">
+            {{item.nameEn}}
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-3 name"><em style="color: #ea0e0e">*</em>商城类目：</div>
+      <div class="col-sm-9" >
+        <div class="col-sm-4" style="padding: 0px;">
+          <select class="form-control"
+                  ng-model="kindPojo.first"
+                  ng-options="key as value.nameCn for (key,value) in kindInfo"
+                  ng-change="kindPojo.second='';kindPojo.third='';"
+                  style="opacity: 1;height:28px;overflow-y: scroll;line-height:28px;padding: 0 6px;">
+            <option value="">请选择一级类目</option>
+          </select>
+        </div>
+        <div class="col-sm-4" style="padding: 0px;">
+          <select class="form-control" ng-model="kindPojo.second"
+                  ng-options="key as value.nameCn for (key,value) in kindInfo[kindPojo.first].children"
+                  ng-change="kindPojo.third='';" style="height:28px;line-height:28px;padding: 0 6px;">
+            <option value="">请选择二级类目</option>
+          </select>
+        </div>
+        <div class="col-sm-4" style="padding: 0px;">
+          <select class="form-control" ng-model="kindPojo.third" style="opacity: 1;height:28px;line-height:28px;padding: 0 6px;"
+                  ng-options="value as value.nameCn for value in kindInfo[kindPojo.first].children[kindPojo.second].children">
+            <option value="">请选择三级类目</option>
+          </select>
+        </div>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-3 name">规格：</div>
+      <div class="col-sm-9">
+        <input type="text" placeholder="请输入规格（非必填）" ng-model="spec" class="form-control" style="width: 240px;height: 28px" />
+      </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

@@ -2734,21 +2734,24 @@
 			</div>
 			<div class="content-line" ng-repeat="(key, mate) in replaceMaterialList" on-finish-render="ngRepeatFinished">
 				<div class="form-item form-left">
-					<span><i>{{key + 1}}</i><em>*</em>型号：</span>
-					<input type="text" class="form-control" ng-readonly="mate.editable == false" ng-model="mate.ptrCmpcode" ng-focus="onFocus($event, 'similar-list1_'+ key, 'code', key)" ng-change="onCodeChange(mate.ptrCmpcode, key, $event)" ng-blur="onCodeBlur(key)" ng-class="{'error': errorObj[key].code == 1}" placeholder="请输入型号名称">
-					<ul class="similar-list" ng-class="'similar-list1_'+ key" ng-show="mate.showSimilarCodeList && similarCode.length > 0 && mate.ptrCmpcode" ng-mouseenter="setIsInCodeList(true, key)" ng-mouseleave="setIsInCodeList(false, key)">
-						<li ng-repeat="sCode in similarCode" ng-bind="sCode.code" title="{{sCode.code}}" ng-click="setCode(key, sCode.code)"></li>
+					<span><i>{{key + 1}}</i><em>*</em>品牌：</span>
+
+					<input type="text" class="form-control" ng-readonly="mate.editable == false" ng-model="mate.ptrBranden" ng-focus="onFocus($event, 'similar-list1_'+ key, 'brand', key)" ng-change="onBrandChange(mate.ptrBranden, key)" ng-blur="onBrandBlur(key)" ng-class="{'error': errorObj[key].brand == 1}" placeholder="请输入品牌名称">
+					<ul class="similar-list" ng-class="'similar-list1_'+ key" ng-show="mate.showSimilarBrandList && similarBrand.length > 0 && mate.ptrBranden" ng-mouseenter="setIsInBrandList(true, key)" ng-mouseleave="setIsInBrandList(false, key)">
+						<li ng-repeat="sBrand in similarBrand" ng-bind="sBrand.nameEn" title="{{sBrand.nameEn}}" ng-click="setBrand(key, sBrand.nameEn)"></li>
 					</ul>
+
 				</div>
 				<div class="form-item form-right">
-					<span><em>*</em>品牌：</span>
-					<input type="text" class="form-control" ng-readonly="mate.editable == false" ng-model="mate.ptrBranden" ng-focus="onFocus($event, 'similar-list2_'+ key, 'brand', key)" ng-change="onBrandChange(mate.ptrBranden, key)" ng-blur="onBrandBlur(key)" ng-class="{'error': errorObj[key].brand == 1}" placeholder="请输入品牌名称">
-					<ul class="similar-list" ng-class="'similar-list2_'+ key" ng-show="mate.showSimilarBrandList && similarBrand.length > 0 && mate.ptrBranden" ng-mouseenter="setIsInBrandList(true, key)" ng-mouseleave="setIsInBrandList(false, key)">
-						<li ng-repeat="sBrand in similarBrand" ng-bind="sBrand.nameEn" title="{{sBrand.nameEn}}" ng-click="setBrand(key, sBrand.nameEn)"></li>
+					<span><em>*</em>型号：</span>
+					<input type="text" class="form-control" ng-readonly="mate.editable == false" ng-model="mate.ptrCmpcode" ng-focus="onFocus($event, 'similar-list2_'+ key, 'code', key)" ng-change="onCodeChange(mate.ptrCmpcode, key, $event)" ng-blur="onCodeBlur(key)" ng-class="{'error': errorObj[key].code == 1}" placeholder="请输入型号名称">
+					<ul class="similar-list" ng-class="'similar-list2_'+ key" ng-show="mate.showSimilarCodeList && similarCode.length > 0 && mate.ptrCmpcode" ng-mouseenter="setIsInCodeList(true, key)" ng-mouseleave="setIsInCodeList(false, key)">
+						<li ng-repeat="sCode in similarCode" ng-bind="sCode.code" title="{{sCode.code}}" ng-click="setCode(key, sCode.code)"></li>
 					</ul>
 					<i class="fa fa-minus-circle" ng-if="replaceMaterialList.length >= 1 && mate.editable != false" ng-click="setReplies('sub', key)"></i>
 					<i class="fa fa-plus-circle" ng-if="key == linearLength - 1 && mate.editable != false" ng-click="setReplies('add', key)"></i>
 				</div>
+
 			</div>
 		</div>
 

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

@@ -2528,16 +2528,16 @@
 			<div class="content-line" ng-repeat="(key, mate) in replaceMaterialList" on-finish-render="ngRepeatFinished">
 				<div class="form-item form-left">
 					<span><i>{{key + 1}}</i><em>*</em>品牌：</span>
-					<input type="text"  ng-readonly="mate.editable == false"  class="form-control" ng-model="mate.ptrBranden" ng-focus="onFocus($event, 'similar-list4_'+ key, 'brand', key)" ng-change="onBrandChange(mate.ptrBranden, key)" ng-blur="onBrandBlur(key)" ng-class="{'error': errorObj[key].brand == 1}" placeholder="请输入品牌名称">
-					<ul class="similar-list" ng-class="'similar-list4_'+ key" ng-show="mate.showSimilarBrandList && similarBrand.length > 0 && mate.ptrBranden" ng-mouseenter="setIsInBrandList(true, key)" ng-mouseleave="setIsInBrandList(false, key)">
+					<input type="text"  ng-readonly="mate.editable == false"  class="form-control" ng-model="mate.ptrBranden" ng-focus="onFocus($event, 'similar-list3_'+ key, 'brand', key)" ng-change="onBrandChange(mate.ptrBranden, key)" ng-blur="onBrandBlur(key)" ng-class="{'error': errorObj[key].brand == 1}" placeholder="请输入品牌名称">
+					<ul class="similar-list" ng-class="'similar-list3_'+ key" ng-show="mate.showSimilarBrandList && similarBrand.length > 0 && mate.ptrBranden" ng-mouseenter="setIsInBrandList(true, key)" ng-mouseleave="setIsInBrandList(false, key)">
 							<li ng-repeat="sBrand in similarBrand" ng-bind="sBrand.nameEn" title="{{sBrand.nameEn}}" ng-click="setBrand(key, sBrand.nameEn)"></li>
 					</ul>
 
 				</div>
 				<div class="form-item form-right">
 					<span><em>*</em>型号：</span>
-					<input type="text"  ng-readonly="mate.editable == false"  class="form-control" ng-model="mate.ptrCmpcode" ng-focus="onFocus($event, 'similar-list3_'+ key, 'code', key)" ng-change="onCodeChange(mate.ptrCmpcode, key)" ng-blur="onCodeBlur(key)" ng-class="{'error': errorObj[key].code == 1}" placeholder="请输入型号名称">
-					<ul class="similar-list" ng-class="'similar-list3_'+ key"  ng-show="mate.showSimilarCodeList && similarCode.length > 0 && mate.ptrCmpcode" ng-mouseenter="setIsInCodeList(true, key)" ng-mouseleave="setIsInCodeList(false, key)">
+					<input type="text"  ng-readonly="mate.editable == false"  class="form-control" ng-model="mate.ptrCmpcode" ng-focus="onFocus($event, 'similar-list4_'+ key, 'code', key)" ng-change="onCodeChange(mate.ptrCmpcode, key)" ng-blur="onCodeBlur(key)" ng-class="{'error': errorObj[key].code == 1}" placeholder="请输入型号名称">
+					<ul class="similar-list" ng-class="'similar-list4_'+ key"  ng-show="mate.showSimilarCodeList && similarCode.length > 0 && mate.ptrCmpcode" ng-mouseenter="setIsInCodeList(true, key)" ng-mouseleave="setIsInCodeList(false, key)">
 						<li ng-repeat="sCode in similarCode" ng-bind="sCode.code" title="{{sCode.code}}" ng-click="setCode(key, sCode.code)"></li>
 					</ul>
 					<i class="fa fa-minus-circle" ng-if="replaceMaterialList.length >= 1 && mate.editable != false" ng-click="setReplies('sub', key)"></i>

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

@@ -223,9 +223,9 @@
         <div class="previewImage">
           <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>
+          <!--<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>