产品导入、物料资料调整。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8942 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -9864,7 +9864,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			var modalInstance = $modal.open({
 				templateUrl: 'static/tpl/index/baseInfo/modal/updateByBatch_modal.html',
 				controller: 'UpdateByBatchCtrl',
-				size: 'lg',
+				size: 'md',
 				resolve: {
 					updatetype: function() {
 						return updatetype;
@@ -15534,7 +15534,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			var modalInstance = $modal.open({
 				templateUrl: 'static/tpl/index/baseInfo/modal/updateByBatch_modal.html',
 				controller: 'UpdateByBatchCtrl',
-				size: 'lg',
+				size: 'md',
 				resolve: {
 					updatetype: function() {
 						return updatetype;

src/main/webapp/resources/tpl/index/baseInfo/modal/updateByBatch_modal.html

@@ -4,21 +4,43 @@
 	font-size: 14px;
 }
 .modal-body {
-	min-height: 350px;
+	min-height: 250px;
 }
 .modal {
  	top: 70px;
 }
+.table-default .header{
+	background: #fff;
+	border-top: none;
+}
+.table-default .header th:hover{
+	background: none;
+}
+	.table>tbody>tr>td{
+		background: #fff;
+	}
+.table-default .header{
+	border-bottom: none !important;
+	box-shadow:  none;
+}
+.table-bordered>thead>tr>th{
+	border-bottom: none;
+	border-top: none;
+}
+.modal-body .table-bordered{
+	border-top: none !important;
+}
 </style>
-<div class="modal-body" style="min-height: 500px;">
-	<div class="headerline">
-		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>修改类型-{{updatetype}}</span>
+<div class="modal-body" style="padding-top: 0;">
+	<div class="modal-header ng-scope">
+	<div class="row">
+		<h3 class="modal-title" style="    padding-left: 3px;">修改类型-{{updatetype}}</h3>
+		</div>
 	</div>
 	<table class="block table table-default table-striped table-bordered">
 		<thead>
 			<tr class="header">
 				<th width="160px">原{{updatetype}}</th>
-				<th width="160px">--></th>
 				<th width="160px">新{{updatetype}}</th>
 			</tr>
 		</thead>
@@ -27,14 +49,13 @@
 				<!-- <td class="text-center" ng-if="updatetype == '品牌'"><span ng-bind="::product.brand"></span></td>
 				<td class="text-center" ng-if="updatetype == '名称（类目）'"><span ng-bind="::product.title"></span></td>
 				<td class="text-center" ng-if="updatetype == '产品型号'"><span ng-bind="::product.spec"></span></td> -->
-				<td ng-if="updatetype == '品牌'"><select type="text" ng-model="oldvalue" ng-options="product.brand for product in products">
+				<td ng-if="updatetype == '品牌'"><select type="text" ng-model="oldvalue" ng-options="product.brand for product in products" class="form-control">
 					<option value="">请选择品牌</option>
 					</select></td>
 				<td ng-if="updatetype == '名称（类目）'"><select type="text" ng-model="oldvalue" ng-options="product.title for product in products">
 					<option value="">请选择名称（类目）</option>
 					</select></td>
-				<td class="text-center">--></td>
-				<td class="text-center"><input type="text" ng-model="newvalue"></span></td>
+				<td class="text-center"><input type="text" ng-model="newvalue" class="form-control"></span></td>
 			</tr>
 		</tbody>
 	</table>
@@ -44,7 +65,6 @@
 	</div> -->
 </div>
 <div class="modal-footer">
-	<button class="btn btn-default" ng-click="okay()" type="button" ng-if="changed">确定修改</button>
-	<button class="btn btn-default" ng-click="returnUpdate()" type="button" ng-if="changed">返回修改</button>
+	<button class="btn btn-primary" ng-click="okay()" type="button">确定</button>
 	<button class="btn btn-default" ng-click="cancel()" type="button" ng-if="!changed">取消</button>
 </div>

src/main/webapp/resources/tpl/index/baseInfo/prodList.html

@@ -136,9 +136,9 @@
         position: relative;
         top: 3px;
     }
-    .order-table tr.header th:first-child{
+    /*.order-table tr.header th:first-child{
         text-align: left;
-    }
+    }*/
     .edit.col-xs-3{
         padding-right: 0;
         width: 215px;
@@ -214,8 +214,8 @@
         <table class="order-table block " ng-table="tableParams">
             <thead>
             <tr class="header">
-            	<th width="80"><label><input type="checkbox" ng-model="checks.checked" ng-click="checkAll()">&nbsp;全选</label></th>
-                <th width="140">产品编号</th>
+            	<!--<th width="80"><label><input type="checkbox" ng-model="checks.checked" ng-click="checkAll()">&nbsp;全选</label></th>-->
+                <th width="140" class="text-center">产品编号</th>
                 <th>产品名称(类目)</th>
                 <th width="160">产品型号</th>
                 <th width="140">品牌</th>
@@ -231,7 +231,7 @@
             </thead>
             <tbody ng-repeat="product in $data">
             <tr class="order-hd">
-            	<td class="text-center"><input type="checkbox" ng-model="product.checked" ng-click="checkOne(product)" ng-disabled="product.cmpUuId != null"></td>
+            	<!--<td class="text-center"><input type="checkbox" ng-model="product.checked" ng-click="checkOne(product)" ng-disabled="product.cmpUuId != null"></td>-->
                 <td class="text-center" title="{{product.code}}" ng-bind="::product.code"></td>
                 <td class="line-h20 first text-center">
                     <div class="order-main">

src/main/webapp/resources/tpl/index/purc/prodList.html

@@ -137,9 +137,9 @@
     position: relative;
     top: 3px;
 }
-.order-table tr.header th:first-child{
+/*.order-table tr.header th:first-child{
     text-align: left;
-}
+}*/
 .edit.col-xs-3{
     padding-right: 0;
     width: 215px;
@@ -216,8 +216,8 @@
         <table class="order-table block " ng-table="tableParams">
             <thead>
             <tr class="header">
-          		<th width="80"><label><input type="checkbox" ng-model="checks.checked" ng-click="checkAll()">&nbsp;全选</label></th>
-                <th width="140">物料编号</th>
+          		<!--<th width="80"><label><input type="checkbox" ng-model="checks.checked" ng-click="checkAll()">&nbsp;全选</label></th>-->
+                <th width="140" class="text-center">物料编号</th>
                 <th>物料名称(类目)</th>
                 <th width="160">物料型号</th>
                 <th width="140">品牌</th>
@@ -233,7 +233,7 @@
             </thead>
             <tbody ng-repeat="product in $data">
             <tr class="order-hd">
-            	<td class="text-center"><input type="checkbox" ng-model="product.checked" ng-click="checkOne(product)" ng-disabled="product.cmpUuId != null"></td>
+            	<!--<td class="text-center"><input type="checkbox" ng-model="product.checked" ng-click="checkOne(product)" ng-disabled="product.cmpUuId != null"></td>-->
                 <td class="text-center" title="{{product.code}}" ng-bind="::product.code"></td>
                 <td class="line-h20 first text-center">
                     <div class="order-main">