修改买家中心待报价与已报价问题

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

@@ -530,7 +530,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
             controllerUrl : "app/controllers/forstore/vendor_materialPersonCtrl",
             controller : 'vendor_materialPersonCtrl'
         })).state('vendor_material_erp', angularAMD.route({
-			title : '企业产品库toErp',
+			title : '公司产品库toErp',
 			url : '/vendor_material_erp?standardParam',
 			templateUrl : 'static/view/vendor/forstore/erp/vendor_material_erp.html',
 			controllerUrl : "app/controllers/forstore/vendor_materialCtrl",

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

@@ -1550,6 +1550,29 @@ define([ 'app/app' ], function(app) {
         }
 
         /**
+        * 修改规格书
+        */
+        $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;
+              }
+            }
+          });
+          modalInstance.result.then(function (Regulpic) {
+            if(Regulpic) {
+              commodity.Regulpic = Regulpic;
+            }
+          }, function() {
+
+          });
+        }
+
+      /**
          * 切换销售模式
          */
         $scope.changeSaleMode = function (commodity) {
@@ -1869,6 +1892,7 @@ define([ 'app/app' ], function(app) {
 
     }]);
 
+    // 上传批次图片
     app.register.controller('editPictureCtrl', ['$scope', 'pic', '$modalInstance', function ($scope, pic, $modalInstance) {
         $scope.pic = pic;
         $scope.cancel = function () {
@@ -1884,4 +1908,21 @@ define([ 'app/app' ], function(app) {
             $modalInstance.close($scope.pic);
         }
     }]);
+
+    // 上传规格书
+    app.register.controller('editRegulationCtrl', ['$scope', 'Regulpic', '$modalInstance', function ($scope, Regulpic, $modalInstance) {
+      $scope.Regulpic = Regulpic;
+      $scope.cancel = function () {
+        $modalInstance.close();
+      };
+
+      // 图片上传成功之后
+      $scope.onUploadSuccess = function(data){
+        $scope.Regulpic = data.path;
+      };
+
+      $scope.confirm = function() {
+        $modalInstance.close($scope.Regulpic);
+      }
+    }]);
 });

src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_erp.html

@@ -1688,7 +1688,7 @@
 	<div class="pro_management device">
 		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
-				<li class="active"><a ui-sref="vendor_material_erp">企业产品库</a></li>
+				<li class="active"><a ui-sref="vendor_material_erp">公司产品库</a></li>
 				<li><a ui-sref="vendor_material_person_erp">个人产品库</a></li>
 				<li><a ui-sref="vendor_onSale_erp">在售产品</a></li>
 				<li><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>

src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_person_erp.html

@@ -1765,7 +1765,7 @@
 	<div class="pro_management device">
 		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
-				<li><a ui-sref="vendor_material_erp">企业产品库</a></li>
+				<li><a ui-sref="vendor_material_erp">公司产品库</a></li>
 				<li class="active"><a ui-sref="vendor_material_person_erp">个人产品库</a></li>
 				<li><a ui-sref="vendor_onSale_erp">在售产品</a></li>
 				<li><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>

src/main/webapp/resources/view/vendor/forstore/erp/vendor_onSale_erp.html

@@ -841,7 +841,7 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%">
-                <li><a ui-sref="vendor_material_erp">企业产品库</a></li>
+                <li><a ui-sref="vendor_material_erp">公司产品库</a></li>
                 <li><a ui-sref="vendor_material_person_erp">个人产品库</a></li>
                 <li class="active"><a ui-sref="vendor_onSale_erp">在售产品</a></li>
                 <li><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>

src/main/webapp/resources/view/vendor/forstore/erp/vendor_undercarriage_erp.html

@@ -553,7 +553,7 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%">
-                <li><a ui-sref="vendor_material_erp">企业产品库</a></li>
+                <li><a ui-sref="vendor_material_erp">公司产品库</a></li>
                 <li><a ui-sref="vendor_material_person_erp">个人产品库</a></li>
                 <li><a ui-sref="vendor_onSale_erp">在售产品</a></li>
                 <li class="active"><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>

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

@@ -1947,7 +1947,7 @@
 	<div class="pro_management device">
 		<div class="com_tab" style="margin-bottom: 10px">
 			<ul class="fl" style="width: 100%">
-				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">企业产品库</a></li>
+				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">公司产品库</a></li>
 				<li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
 				<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
 				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
@@ -2483,7 +2483,7 @@
 						<!--<strong class="text-inverse">*</strong>商城暂未收录的 品牌/器件，”原厂型号“将会显示为空且不可上架售卖，<br/>-->
 						<!--如需上架可先点击 【匹配】按钮，若匹配不成功，可前往<a ui-sref="vendor_brand_apply" target="_blank"> 品牌申请/</a><a ui-sref="vendor_component_apply" target="_blank">器件申请</a>，提出申请-->
 					<!--</div>-->
-					<div class="tip">* 上架成功30分钟后，方可被客户搜索到，并在企业产品库展示。</div>
+					<div class="tip">* 上架成功30分钟后，方可被客户搜索到，并在公司产品库展示。</div>
 					<div ng-if="currenctMaterial.length != 0">显示 {{(param.page - 1) * 10 + 1}}-
 						<span ng-if="param.currentPage == materialAll.totalPages" ng-bind="materialAll.totalElements"></span>
 						<span ng-if="param.currentPage != materialAll.totalPages" ng-bind="param.page * param.count"></span>， 共： <span ng-bind="materialAll.totalElements" style="color: #5078cb;"></span> 个</div>

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

@@ -1810,7 +1810,7 @@
 	<div class="pro_management device">
 		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
-				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">企业产品库</a></li>
+				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">公司产品库</a></li>
 				<li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
 				<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
 				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>

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

@@ -957,7 +957,7 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%">
-                <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">企业产品库</a></li>
+                <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">公司产品库</a></li>
                 <li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
                 <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
                 <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
@@ -1194,8 +1194,8 @@
                                         <div class="edit-img">
                                             <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>

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

@@ -576,7 +576,7 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%">
-                <li ng-class="{'active': tab == 'vendor_material'}"><a ui-sref="vendor_material">企业产品库</a></li>
+                <li ng-class="{'active': tab == 'vendor_material'}"><a ui-sref="vendor_material">公司产品库</a></li>
                 <li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
                 <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
                 <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>

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

@@ -533,7 +533,7 @@
                 <li ng-class="{'active': $$productOn.tab == 'bathOnPerson'}" ng-click="toggleActive('bathOnPerson')"><a href="">导入个人库</a></li>
             </ul>
             <ul class="fl" style="width: 100%" ng-if="isPcbStore">
-                <li><a ui-sref="vendor_material">企业产品库</a></li>
+                <li><a ui-sref="vendor_material">公司产品库</a></li>
                 <li><a ui-sref="vendor_material_person">个人产品库</a></li>
                 <li><a ui-sref="vendor_onSale">在售产品</a></li>
                 <li><a ui-sref="vendor_undercarriage">上下架历史</a></li>
@@ -701,7 +701,7 @@
                         <div style="margin-top: -40px;" ng-if="$$productOn.tab == 'bathOn'">3、如核对信息无误之后，点击确认发布</div>
                         <div>
                             <span class="blue-bg publish" href="javascript:void(0)" ng-click="publish($event)" ng-disabled="!pageParams.totalElements" ng-show="$$productOn.tab == 'bathOn'"><span>确认上架</span></span>
-                            <b class="tip" ng-show="$$productOn.tab == 'bathOn'">* 上架成功30分钟后，方可被客户搜索到，并在企业产品库展示。</b>
+                            <b class="tip" ng-show="$$productOn.tab == 'bathOn'">* 上架成功30分钟后，方可被客户搜索到，并在公司产品库展示。</b>
                         </div>
                     </div>
                 </div>

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

@@ -0,0 +1,178 @@
+<!--修改图片-->
+<style>
+  .modal-dialog{
+    width: 535px;
+    height: 345px;
+  }
+  .update-img{
+    width: 520px;
+    height: 324px;
+  }
+  .update-img .update-big-img{
+    width: 265px;
+    float: left;
+    margin-top: 5px;
+  }
+  .update-img .update-big-img p{
+    line-height: 30px;
+    font-size: 14px;
+  }
+  .update-img .update-big-img .previewImage{
+    width: 256px;
+    height: 256px;
+    overflow: hidden;
+    line-height: 256px;
+    border: #e6e6e6 1px solid;
+    margin-bottom: 5px;
+  }
+  .update-img .update-big-img .previewImage img{
+    width: 256px;
+    height: 256px;
+  }
+  .update-img .update-file-btn{
+    width: 244px;
+    float: left;
+    margin-left: 3px;
+  }
+  .update-img .update-file-btn p{
+    line-height: 30px;
+    position: relative;
+    text-align: center;
+    margin-top: 8px;
+    height: 30px;
+  }
+  .update-img .update-file-btn p input{
+    width: 80px;
+    height: 30px;
+    z-index: 10;
+    position: absolute;
+    left: 0;
+    top: 0;
+    opacity: 0;
+  }
+  .update-img .update-file-btn p span{
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 80px;
+    display: inline-block;
+    height: 30px;
+    text-align: center;
+    font-size: 14px;
+    line-height: 30px;
+    background: #bebbbb;
+    z-index: 9;
+  }
+  .update-img .update-file-btn p a{
+    width: 70px;
+    display: inline-block;
+    height: 30px;
+    line-height: 30px;
+    text-align: center;
+    font-size: 14px;
+  }
+  .update-img .update-file-btn p a.off{
+    background: #bebbbb;
+    float: left;
+  }
+  .update-img .update-file-btn p a.ok{
+    background: #5078cb;
+    color: #fff;
+    float: right;
+    margin-right: 44px;
+  }
+  .update-img .update-file-btn p a:hover,.update-img .update-file-btn p span:hover{
+    background: #3f7ae3;
+    color: #fff;
+    cursor: pointer;
+  }
+  .uploadImage{
+    width: 100%;
+    height: 30px;
+    z-index: 10;
+    position: absolute;
+    left: 0;
+    top: 0;
+    opacity: 0;
+  }
+  .update-file-btn .previewImage{
+    width: 100%;
+    height: 30px;
+  }
+  .update-file-btn .previewImage:hover{
+    cursor: pointer;
+  }
+  .close{
+    position: absolute;
+    top: 0;
+    right: 5px;
+  }
+  .modal-body{
+    padding: 10px;
+  }
+  .file-text{
+    width: 100%;
+    margin: 0 auto;
+    margin-top: 35px;
+  }
+  .file-text h3{
+    line-height: 26px;
+    background: #e3e3e6;
+    font-size: 12px;
+    text-align: center;
+    font-weight: bold;
+  }
+  .file-text div{
+    width: 100%;
+    height: 215px;
+    background: #f6f6f7;
+    line-height: 20px;
+    font-size: 12px;
+    padding: 5px 10px;
+  }
+  .prompt{
+    font-size: 12px;
+    width: 270px;
+    display: inline-block;
+    margin-top: 5px;
+  }
+</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 class="update-big-img">
+        <p>大图预览</p>
+        <div class="previewImage">
+          <a href="{{Regulpic}}" target="_blank" ng-if="Regulpic != ''"><img ng-src="{{Regulpic}}" alt="商品图片"></a>
+          <img ng-src="{{Regulpic}}" alt="商品图片" ng-if="!Regulpic">
+        </div>
+        <span class="prompt"><em style="color: #f00;">*</em>  建议使用不小于256*256px图片，大小不超过3M</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;的图片）.
+          </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">
+                            <span>选择文件</span>
+                        </span>
+          <a ng-click="confirm()" class="ok">确定</a>
+        </p>
+      </div>
+    </div>
+  </div>
+</div>