excel遗留bug处理

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

@@ -949,4 +949,9 @@ input::-webkit-input-safebox-button{
 	display: none;
 }
 /*去除textarea默认右下角可自由放大样式*/
-textarea{resize:none}
+textarea{resize:none}
+
+.modal-content {
+	overflow-y: auto;
+	max-height: 500px;
+}

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

@@ -72,12 +72,12 @@ img {
 .ghost-center {
     position: relative;
 }
-.ghost-center::before {
+/*.ghost-center::before {
     content: " ";
     display: inline-block;
     height: 100%;
     vertical-align: middle;
-}
+}*/
 .ghost-center > * {
     display: inline-block;
     vertical-align: middle;

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

@@ -61,14 +61,19 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 			// $scope.sortByERP = type == $scope.sortByERP ? 'none' : type;
 			loadData();
 		}
-
-		if ($location.$$path.endsWith('vendor_material_unstandard_erp')) {
-			$scope.tab = 'unstandard_material';
-			// $scope.standard_tab = 'unstandard';
-            $scope.param.type = "nStandard";
-            // $scope.param.sorting = {code : 'ASC'};
-            $scope.isBatch = false;
-		}
+        //
+		// var startWith = function (str, s) {
+		// 	var reg = new RegExp(str + '$');
+		// 	return reg.test(str);
+		// };
+        //
+		// if (startWith($location.$$path, 'vendor_material_unstandard_erp')) {
+		// 	$scope.tab = 'unstandard_material';
+		// 	// $scope.standard_tab = 'unstandard';
+         //    $scope.param.type = "nStandard";
+         //    // $scope.param.sorting = {code : 'ASC'};
+         //    $scope.isBatch = false;
+		// }
 
 		$scope.goods = { breakUp: 1, isSelfSupport: 1, prices: [{}] };
 		$scope.isSelfSupport = true;

src/main/webapp/resources/view/common/site-nav.html

@@ -75,6 +75,7 @@
     #site-nav .dropdown .dropdown-menu >ul{
         max-height: 300px;
         overflow-y: auto;
+        padding: 0;
     }
     #site-nav .dropdown .dropdown-menu >ul >li {
         padding: 0 12px;
@@ -150,7 +151,7 @@
     #site-nav * {
         box-sizing: border-box;
         list-style: none;
-        white-space: nowrap;
+        /*white-space: nowrap;*/
     }
     .unstyled a:hover,.dropdown-menu a:hover{
         color: #d32526;

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

@@ -1503,10 +1503,10 @@
 	<div class="pro_management device">
 		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
-				<li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp({standardParam:'unstandard'})">非标产品</a></li>
-				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material_erp({standardParam:'standard'})">标准产品</a></li>
-				<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale_erp">在售产品</a></li>
-				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>
+				<li><a ui-sref="vendor_material_unstandard_erp({standardParam:'unstandard'})">非标产品</a></li>
+				<li class="active"><a ui-sref="vendor_material_erp({standardParam:'standard'})">标准产品</a></li>
+				<li><a ui-sref="vendor_onSale_erp">在售产品</a></li>
+				<li><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>
 			</ul>
 		</div>
 		<!--非标和标准产品列表页-->

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

@@ -1503,10 +1503,10 @@
 	<div class="pro_management device">
 		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
-				<li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp({standardParam:'unstandard'})">非标产品</a></li>
-				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material_erp({standardParam:'standard'})">标准产品</a></li>
-				<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale_erp">在售产品</a></li>
-				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>
+				<li class="active"><a ui-sref="vendor_material_unstandard_erp({standardParam:'unstandard'})">非标产品</a></li>
+				<li><a ui-sref="vendor_material_erp({standardParam:'standard'})">标准产品</a></li>
+				<li><a ui-sref="vendor_onSale_erp">在售产品</a></li>
+				<li><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>
 			</ul>
 		</div>
 		<!--非标和标准产品列表页-->

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

@@ -512,8 +512,8 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%">
-                <li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp">非标产品</a></li>
-                <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material_erp">标准产品</a></li>
+                <li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp({standardParam:'unstandard'})">非标产品</a></li>
+                <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material_erp({standardParam:'standard'})">标准产品</a></li>
                 <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale_erp">在售产品</a></li>
                 <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>
                 <li class="down-goods">

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

@@ -539,8 +539,8 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%">
-                <li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp">非标产品</a></li>
-                <li ng-class="{'active': tab == 'vendor_material'}"><a ui-sref="vendor_material_erp">标准产品</a></li>
+                <li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp({standardParam:'unstandard'})">非标产品</a></li>
+                <li ng-class="{'active': tab == 'vendor_material'}"><a ui-sref="vendor_material_erp({standardParam:'standard'})">标准产品</a></li>
                 <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale_erp">在售产品</a></li>
                 <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>
             </ul>