物料选择界面UI调整

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

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

@@ -8511,6 +8511,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 					$scope.prodInfo.cmpUuId = data.uuid;
 					$scope.prodInfo.cmpCode = data.code;
 					$scope.prodInfo.brand = data.brand.nameEn;
+					console.log($scope.prodInfo.brand);
 				}, function(){
 					
 				});

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

@@ -37,11 +37,11 @@
 		</thead>
 		<tbody>
 			<tr ng-repeat="product in $data">
-				<td class="text-center" ng-bind="::product.code"></td>
-				<td class="text-center" ng-bind="::product.brand.nameCn"></td>
-				<td class="text-center" ng-bind="::product.brand.nameEn"></td>
-				<td class="text-center f12" ng-bind="::product.uuid"></td>
-				<td class="text-center"><a title="选择" href="javascript:void(0)" ng-click="check(product)"><i class="fa fa-check-square-o"></i></a></td>
+				<td class="text-center"><a ng-click="check(product)" ng-bind="::product.code"></a></td>
+				<td class="text-center"><a ng-click="check(product)" ng-bind="::product.brand.nameCn"></a></td>
+				<td class="text-center"><a ng-click="check(product)" ng-bind="::product.brand.nameEn"></a></td>
+				<td class="text-center f12"><a ng-click="check(product)" ng-bind="::product.uuid"></a></td>
+				<td class="text-center"><a title="选择" href="javascript:void(0)" ng-click="check(product)">选择</a></td>
 			</tr>
 		</tbody>
 	</table>

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

@@ -93,7 +93,7 @@
                 </dd>
                 <dd>
                     <div class="fl">产品品牌：</div>
-                    <div class="fr"><input type="text" g-model="prodInfo.brand" type="text" placeholder="产品品牌" style="cursor: pointer;" readonly="readonly"><span>（关联器件物料品牌，不可编辑）</span></div>
+                    <div class="fr"><input type="text" ng-model="prodInfo.brand" placeholder="产品品牌" style="cursor: pointer;" readonly="readonly"><span>（关联器件物料品牌，不可编辑）</span></div>
                 </dd>
                 <dd>
                     <div class="fl">产品编号：</div>

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

@@ -285,8 +285,7 @@
 								ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">待报价</button>
 					</div>
 					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-								ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">已过期</button>
+						<button type="button" class="btn btn-default btn-line"  ui-sref="purc.inquiry_unapply">未提交</button>
 					</div>
 				</div>
 			</div>