物料产品列表显示错误的问题的处理

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

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

@@ -224,12 +224,10 @@
                     </div>
                 </td>
                 <td class="hover-show text-center" ng-class="{'bg01' : product.standard == 1 , 'bg02' :  product.standard != 1}" ng-if="product.standard != 1">
-                	<!-- <a href="http://www.usoftmall.com/product#/component/{{product.cmpUuId}}/" title="产品型号" ng-bind="::product.cmpCode"  target="_blank" ng-if="product.standard == 0"></a> -->
                 	<span title="产品型号" ng-bind="::product.cmpCode" ng-if="product.standard != 1"></span>
                 </td>
                 <td class="hover-show text-center" ng-class="{'bg01' : product.standard ==1 , 'bg02' : product.standard != 1}" ng-if="product.standard == 1">
                 	<a href="http://www.usoftmall.com/product#/component/{{product.cmpUuId}}/" title="产品型号" ng-bind="::product.pcmpcode"  target="_blank" ng-if="product.standard == 1"></a>
-                	<!-- <span title="产品型号" ng-bind="::product.pcmpcode" ng-if="product.standard == 0"></span> -->
                 </td>
                <td class="text-center" title="{{product.brand}}" ng-bind="::product.brand" ng-if="product.standard != 1"></td>
                 <td class="text-center" title="{{product.pbranden}}" ng-bind="::product.pbranden" ng-if="product.standard == 1"></td>

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

@@ -198,6 +198,14 @@
                             <button type="button" class="btn btn-select"
                                     ng-class="{'btn-selected':active=='end'}" ng-click="setActive('end')">已下载</button>
                         </div>
+                        <div class="btn-group">
+                            <button type="button" class="btn btn-select"
+                                    ng-class="{'btn-selected':active=='agreed'}" ng-click="setActive('agreed')">已同意</button>
+                        </div>
+                        <div class="btn-group">
+                            <button type="button" class="btn btn-select"
+                                    ng-class="{'btn-selected':active=='refused'}" ng-click="setActive('refused')">不同意</button>
+                        </div>
                     </div>
                    <!-- <div class="col-xs-1 pull-right" style="padding-top: 5px;">
             		            共<span class="text-num">{{total}}</span>

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

@@ -256,12 +256,10 @@
                     </div>
                 </td>
                 <td class="hover-show text-center" ng-class="{'bg01' : product.standard == 1 , 'bg02' :  product.standard != 1}" ng-if="product.standard != 1">
-                	<!-- <a href="http://www.usoftmall.com/product#/component/{{product.cmpUuId}}/" title="产品型号" ng-bind="::product.cmpCode"  target="_blank" ng-if="product.standard == 0"></a> -->
-                	<span title="产品型号" ng-bind="::product.cmpCode" ng-if="product.standard == 0"></span>
+                	<span title="产品型号" ng-bind="::product.cmpCode" ng-if="product.standard != 1"></span>
                 </td>
                 <td class="hover-show text-center" ng-class="{'bg01' : product.standard ==1 , 'bg02' : product.standard != 1}" ng-if="product.standard == 1">
                 	<a href="http://www.usoftmall.com/product#/component/{{product.cmpUuId}}/" title="产品型号" ng-bind="::product.pcmpcode"  target="_blank" ng-if="product.standard == 1"></a>
-                	<!-- <span title="产品型号" ng-bind="::product.pcmpcode" ng-if="product.standard == 0"></span> -->
                 </td>
                 <td class="line-h20 text-center" title="{{product.brand}}" ng-bind="::product.brand" ng-if="product.standard != 1"></td>
                 <td class="line-h20 text-center" title="{{product.pbranden}}" ng-bind="::product.pbranden" ng-if="product.standard == 1"></td>