联想下拉框bug修改

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

@@ -1,4 +1,4 @@
-define([ 'app/app' ], function(app) {
+define([ 'app/app', 'jquery-uploadify' ], function(app) {
 	'use strict';
 	app.register.controller('vendor_materialCtrl', ['$scope', '$rootScope', 'Material', 'toaster', 'ComponentActive', 'Enterprise', '$q', 'NumberService', '$location', '$stateParams', 'Search', '$modal', 'ComponentActiveAPI', function ($scope, $rootScope, Material, toaster, ComponentActive, Enterprise, $q, NumberService, $location, $stateParams, Search, $modal, ComponentActiveAPI) {
 		$rootScope.active = 'vendor_material';
@@ -1156,13 +1156,13 @@ define([ 'app/app' ], function(app) {
 
 		};
 
-		$scope.attachName = '';
+		$scope.attachNameInfo = '';
 		//上传规格书
 		$scope.onAttachInput = function (event) {
-			$scope.attachName = event.target.files[0].name;
+			$scope.attachNameInfo = event.target.files[0].name;
 		};
 		$scope.deleteAttach = function () {
-			$scope.attachName = '';
+			$scope.attachNameInfo = '';
 		};
 
 	}]);

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

@@ -109,6 +109,7 @@
 	.public-tab.table>tbody>tr>td{
 		border-top: none;
 		border-bottom: #e8e8e8 1px solid;
+        overflow: inherit;
 	}
 	.public-tab.table>tbody>tr>td a{
 		margin: 0 10px;
@@ -490,6 +491,12 @@
 		border: 1px solid #ccc;
 		cursor: pointer;
 	}
+	.content .brand-desc {
+		overflow: hidden;
+		width: 391px;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
 </style>
 <div class="user_right fr">
 	<!--货品管理-->
@@ -510,7 +517,7 @@
 			</div>
 			<div class="check fr">
 				<!--<a ng-show="!isBatch && standard_tab == 'unstandard'" ng-click="matchAll()"><span ng-show="!isBatch && standard_tab == 'unstandard'">一键匹配</span></a>-->
-				<a ng-show="!isBatch" ng-click="enterBatch()"><span ng-show="!isBatch">批量操作：</span></a>
+				<a ng-show="!isBatch" ng-click="enterBatch()"><span ng-show="!isBatch">批量操作</span></a>
 				<span class="check-btn" ng-show="isBatch">
                     <label class="check-active">
                         <input type="checkbox"  ng-click="chooseAll()" ng-checked="isChoosedAll" id="AllChoose"/>
@@ -588,7 +595,7 @@
 									<input type="text" class="form-control" ng-model="submitProduct.website">
 								</div>
 							</div>
-							<div class="content">
+							<div class="content" ng-if="material.pbranduuid">
 								<div class="material-form-line">
 									<span>*原厂标准型号：</span>
 									<input type="text" name="code" ng-model="submitProduct.component.code" class="form-control"
@@ -608,16 +615,20 @@
 								</div>
 								<div class="material-form-line">
 									<span>*规格书：</span>
-									<label ng-show="attachName == ''">
-										<input type="file" onchange="angular.element(this).scope().onAttachInput(event)" class="form-control">
-										<p>上传规格书（pdf格式）</p>{{attachName}}
+									<label ng-show="attachNameInfo == ''">
+										<input type="file" onchange="angular.element(this).scope().onAttachInput(event)" accept=".pdf" class="form-control">
+										<!--<div class="form-control" uploadify="{}" on-success="onAttachInput($data)"/>-->
+										<p>上传规格书（pdf格式）</p>{{attachNameInfo}}
 									</label>
-									<label  ng-show="attachName != ''">
-										<p>{{attachName}}</p>
+									<label ng-show="attachNameInfo != ''">
+										<p>{{attachNameInfo}}</p>
 										<a style="margin-left: 5px;" href="javascript:void(0)" ng-click="deleteAttach()">删除</a>
 									</label>
 								</div>
 							</div>
+							<div class="content" ng-if="!material.pbranduuid">
+								<p class="brand-desc">品牌介绍：asdfa是是是是是是是是是是所是是是是是是所是是是是是是所所所所所是是是是是是所是是是是是是所是是是是是是所是是是是是是所所所所所是是是是是是所是是所是是是是是是所是是是是是是所所所所所是是是是是是所是是是是是是所谁谁谁少时诵诗书所所所所所所所所撒所所所所所fa</p>
+							</div>
 							<div class="content" style="width: 56px; float: right; margin-right: 10px;">
 								<p class="title">&nbsp;</p>
 								<div class="input-list">