Merge remote-tracking branch 'origin/feature-201815-liusw' into feature-201815-liusw

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

@@ -878,7 +878,7 @@ define(['angular', 'showdown', 'angular-toaster'], function(angular) {
 
 						if (_accept) {
 							// 如果有，则先处理pdf
-              if (!/\/(pdf)$/.test(file.type)) {
+              if (!/\/(pdf)$/.test(file.files[0].type)) {
                 alert('请上传可支持的格式');
                 return false;
               }

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

@@ -1138,9 +1138,10 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 	}]);
 
   // 上传规格书
-  app.controller('editRegulationCtrl', ['$scope', 'Regulpic', '$modalInstance','showAction', 'Search', 'ChooseItem', function ($scope, Regulpic, $modalInstance, showAction, Search, ChooseItem) {
+  app.controller('editRegulationCtrl', ['$scope', 'Regulpic', '$modalInstance','showAction', 'Search', 'ChooseItem', 'toaster', function ($scope, Regulpic, $modalInstance, showAction, Search, ChooseItem, toaster) {
     $scope.iniUrlImg = 'static/img/vendor/images/upload_file_icon.png'
-    $scope.Regulpic = Regulpic;
+    $scope.Regulpic = Regulpic; // 图片
+    $scope.Ischange = (ChooseItem.productAttachSubmit && ChooseItem.productAttachSubmit.uploadAttach || ChooseItem.attach) ? true : false
     $scope.showAction = showAction || false  // 个人产品库和企业产品 还是在售产品
 	  $scope.IsLookOrUpdate = ChooseItem.standard === 1 ? 'look' : 'update' // 编辑还是查看
     $scope.brandcode = ChooseItem.pbranden || ChooseItem.pbrand || ($scope.IsLookOrUpdate === 'update' ? '' : '-') // 品牌
@@ -1149,8 +1150,8 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
     $scope.spec = ChooseItem.spec || '' // 规格
     $scope.cmpcode = ChooseItem.pcmpcode || ($scope.IsLookOrUpdate === 'update' ? '' : '-') // 型号
     $scope.CodeList = [] // 型号数组
-	  $scope.RegulChange = true // 规格书是否可以编辑
-	  $scope.RegulpicUrl = ChooseItem.Regulpic
+	  $scope.RegulChange = (ChooseItem.standard === 1 && $scope.Ischange) ? false : true // 规格书是否可以编辑
+	  // $scope.RegulpicUrl = ChooseItem.Regulpic
     $scope.cancel = function () {
       $modalInstance.close();
     };
@@ -1172,7 +1173,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
         pbranden: $scope.brandcode,
         kind: $scope.kind,
         pcmpcode: $scope.cmpcode,
-        url: $scope.Regulpic === $scope.iniUrlImg ? '' : $scope.Regulpic,
+        url: ($scope.Regulpic === $scope.iniUrlImg || $scope.Regulpic === Regulpic) ? '' : $scope.Regulpic,
         spec: $scope.spec,
 	      id: ChooseItem.id
       }
@@ -1188,6 +1189,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
     // 图片上传成功之后
     $scope.onUploadSuccess = function(data){
       $scope.Regulpic = data.path;
+      $scope.Ischange = true
     };
 
 

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

@@ -1565,13 +1565,17 @@ define([ 'app/app' ], function(app) {
                 return false
               },
               ChooseItem: function() {
-                  return {}
+                commodity.standard = !commodity.uuid ? 0 : 1
+                commodity.pbranden = commodity.brandNameEn
+                commodity.kind = commodity.kindNameCn
+                commodity.pcmpcode = commodity.code
+                return commodity
               }
             }
           });
           modalInstance.result.then(function (Regulpic) {
             if(Regulpic) {
-              commodity.attach = Regulpic;
+              commodity.attach = Regulpic.url;
             }
           }, function() {
 

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

@@ -2101,19 +2101,19 @@
 							<span ng-bind="material.spec || '-'" title="{{material.spec || '-'}}"></span>
 						</td>
 						<td style="overflow: initial;">
-							<div class="Regulpic">
-								<a href="{{material.productAttachSubmit.uploadAttach}}" target="_blank" ng-if="material.productAttachSubmit" class="Regulpica">
+							<div class="Regulpic" ng-if="material.productAttachSubmit || material.attach">
+								<a href="{{material.productAttachSubmit.uploadAttach || material.attach}}" target="_blank"  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" ng-if="">
+										<div style="position: relative;display: inline-block" class="ToforAdminLook" ng-if="material.productAttachSubmit.uploadAttach">
 											<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="material.productAttachSubmit && !material.productAttachSubmit.uploadAttach">
-									-
-								</div>
+							</div>
+							<div ng-if="!material.attach && !material.productAttachSubmit.uploadAttach">
+							 -
 							</div>
 						</td>
 						<td ng-bind="material.unit || 'PCS'" title="{{material.unit  || 'PCS'}}"></td>
@@ -2126,7 +2126,7 @@
 								<!--<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(material.productAttachSubmit.uploadAttach || 'static/img/vendor/images/upload_file_icon.png', material)">
+							<span ng-click="editRegulPicture(material.productAttachSubmit.uploadAttach || material.attach || 'static/img/vendor/images/upload_file_icon.png', material)">
 								<span>编辑物料</span>
 							</span>
 							<!---->

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

@@ -1916,19 +1916,19 @@
 						</td>
 						<!-- 新增规格书字段 -->
 						<td style="overflow: initial;">
-							<div class="Regulpic">
-								<a href="{{material.productAttachSubmit.uploadAttach}}" target="_blank" ng-if="material.productAttachSubmit" class="Regulpica">
+							<div class="Regulpic" ng-if="material.productAttachSubmit || material.attach">
+								<a href="{{material.productAttachSubmit.uploadAttach || material.attach}}" target="_blank"  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" ng-if="">
+										<div style="position: relative;display: inline-block" class="ToforAdminLook" ng-if="material.productAttachSubmit.uploadAttach">
 											<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="material.productAttachSubmit && !material.productAttachSubmit.uploadAttach">
-									-
-								</div>
+							</div>
+							<div ng-if="!material.attach && !material.productAttachSubmit.uploadAttach">
+								-
 							</div>
 						</td>
 						<!-- /end 新增规格书字段 -->

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

@@ -981,7 +981,7 @@
         background: #fff;
         display: none
     }
-    .ToforAdminLook:hover .forAdminLook {
+    .ToforAdminLook .nopass:hover ~.forAdminLook {
         display: block;
     }
 
@@ -1192,13 +1192,14 @@
                             <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">
+                                <div ng-if="commodity.attach || commodity.productAttachSubmit" 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.attach || commodity.productAttachSubmit.uploadAttach}}" 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;"/>
+                                    <img ng-if="commodity.productAttachSubmit.uploadAttach" src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;" class="nopass"/>
                                     <div class="forAdminLook">待审核</div>
                                 </div>
+                                <div style="position: relative;display: inline-block;width: auto;margin-top: 0px" ng-if="!commodity.attach && !commodity.productAttachSubmit">-</div>
                                 <!--<div class="forAdminLook" style="margin-left: 35px;">待审核</div>-->
                             </div>
                         </td>
@@ -1347,10 +1348,13 @@
                                     <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" ng-click="editRegulPicture(commodity.Regulpic || 'static/img/store/common/default.png', commodity)" class="Regulpica">
+                                            <a style="text-decoration: none;margin: 0px;border-bottom:0px" target="_blank" href="{{commodity.attach}}" class="Regulpica" ng-if="commodity.attach">
                                                 <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;"/>
+                                            <a class="Regulpica" ng-click="editRegulPicture(commodity.productAttachSubmit.uploadAttach || 'static/img/vendor/images/upload_file_icon.png', commodity)" ng-if="!commodity.attach">
+                                                <img style="width:24px;height:26px" src="static/img/vendor/images/pdf.png"/>
+                                            </a>
+                                            <img ng-if="commodity.productAttachSubmit.uploadAttach" src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;" class="nopass"/>
                                             <div class="forAdminLook">待审核</div>
                                         </div>
                                     </div>

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

@@ -26,8 +26,8 @@
     position: relative;
   }
   .update-img .update-big-img .previewImage img{
-    width: 256px;
-    height: 256px;
+    width: 100%;
+    height: 100%;
   }
   .update-img .update-file-btn{
     width: 244px;
@@ -88,7 +88,7 @@
   }
   .uploadImage{
     width: 100%;
-    height: 30px;
+    height:100%;
     z-index: 10;
     position: absolute;
     left: 0;
@@ -311,11 +311,11 @@
         <li class="wuliao_list clearboth">
           <div class="name pull-left" style="width: 60px">规格书：</div>
           <div ng-show="RegulChange" style="line-height: 30px;position: relative;height: 30px;width: 60px;text-align: center;" class="pull-left">
-            <input type="file" image-upload class="uploadImage"  on-success="onUploadSuccess($data, $file)" non-preview="true" maxSize="20971520" errorSizeMsg="'文件大小不能超过20M'">
+            <input type="file" image-upload class="uploadImage" accept=".pdf"   on-success="onUploadSuccess($data, $file)" maxSize="20971520" errorSizeMsg="'文件大小不能超过20M'">
             <span style="color: #5078cb;cursor: pointer;">点击上传</span>
           </div>
           <div ng-show="!RegulChange">
-            <a href="{{RegulpicUrl}}">
+            <a href="{{Regulpic}}" target="_blank">
               <img src="static/img/vendor/images/pdf.png" style="width:31px;height:35px;" />
             </a>
           </div>
@@ -324,8 +324,10 @@
       <div ng-if="showAction && RegulChange" class="clearboth">
         <div class="update-big-img" style="margin-top: 0px;width: 197px;">
           <div class="previewImage" style="height: 197px;width: 197px;line-height: 197px;text-align: center">
-            <img ng-src="{{Regulpic}}" alt="商品图片" style="height: 159px;width: 130px;">
-            <img ng-src="{{Regulpic}}" alt="商品图片" ng-if="!Regulpic" style="height: 197px;line-height: 197px;width: 197px;">
+            <!--<img ng-if="Regulpic" ng-src="static/img/vendor/images/pdf.png" alt="商品图片"  style="height: 197px;line-height: 197px;width: 197px;">-->
+            <input type="file" image-upload class="uploadImage" accept=".pdf"   on-success="onUploadSuccess($data, $file)" maxSize="20971520" errorSizeMsg="'文件大小不能超过20M'">
+            <img ng-src="{{Ischange ? 'static/img/vendor/images/pdf.png' : Regulpic}}" alt="商品图片" style="height: 159px;width: 130px;">
+            <!--<img ng-src="{{Regulpic}}" alt="商品图片" ng-if="!Ischange" style="height: 197px;line-height: 197px;width: 197px;">-->
             <div class="cover" style="background: rgba(0,0,0,0)">
               <i class="fa fa-trash" style="z-index: 98" ng-click="deleteImg()"></i>
             </div>
@@ -369,13 +371,15 @@
       <!-- 在售产品 -->
       <div ng-if="!showAction" class="clearboth">
         <div class="update-big-img">
-          <div class="previewImage">
-            <img ng-src="{{Regulpic}}" alt="商品图片">
-            <img ng-src="{{Regulpic}}" alt="商品图片" ng-if="!Regulpic">
+          <div class="previewImage" style="text-align: center">
+            <input type="file" image-upload class="uploadImage" accept=".pdf"   on-success="onUploadSuccess($data, $file)" maxSize="20971520" errorSizeMsg="'文件大小不能超过20M'">
+            <img ng-src="{{Ischange ? 'static/img/vendor/images/pdf.png' : Regulpic}}" alt="商品图片" style="height: 159px;width: 130px;">
+            <!--<img ng-if="Regulpic" ng-src="static/img/vendor/images/pdf.png" 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'">
+            <a href="{{Regulpic}}" target="_blank" ng-if="Regulpic != iniUrlImg">
               <div class="cover">
                 <div class="look"><i class="fa fa-search"></i>查看</div>
               </div>
@@ -394,7 +398,7 @@
           </div>
           <p>
                           <span style="left:40px;">
-                              <input maxSize="20971520" type="file" image-upload class="uploadImage" accept=".pdf" on-success="onUploadSuccess($data, $file)" non-preview="true" errorSizeMsg="'文件大小不能超过20M'">
+                              <input maxSize="20971520" type="file" image-upload class="uploadImage" accept=".pdf" on-success="onUploadSuccess($data, $file)"  errorSizeMsg="'文件大小不能超过20M'">
                               <span>选择文件</span>
                           </span>
             <a ng-click="confirm()" class="ok">确定</a>