更新物料、产品页面显示数据方法的过滤条件

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

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

@@ -219,16 +219,16 @@
                 <td class="text-center" title="{{product.code}}" ng-bind="::product.code"></td>
                 <td class="line-h20 first text-center">
                     <div class="order-main">
-                        <a ng-bind="::product.title"  ng-if="product.kind == null"></a>
-                        <a ng-bind="::product.kind" ng-if="product.kind != null"></a>
+                        <a ng-bind="::product.title"  ng-if="product.standard == 0"></a>
+                        <a ng-bind="::product.kind" ng-if="product.standard == 1"></a>
                     </div>
                 </td>
                 <td class="hover-show text-center" ng-class="{'bg01' : product.cmpUuId != null && product.cmpCode != null , 'bg02' : product.cmpUuId == null && product.cmpCode != null , '': product.cmpCode == null}">
                 	<a href="http://www.usoftmall.com/product#/component/{{product.cmpUuId}}/" title="产品型号" ng-bind="::product.cmpCode"  target="_blank" ng-if="product.cmpUuId != null"></a>
                 	<span title="产品型号" ng-bind="::product.cmpCode" ng-if="product.cmpUuId == null"></span>
                 </td>
-               <td class="text-center" title="{{product.brand}}" ng-bind="::product.brand" ng-if="product.pbranden == null"></td>
-                <td class="text-center" title="{{product.pbranden}}" ng-bind="::product.pbranden" ng-if="product.pbranden != null"></td>
+               <td class="text-center" title="{{product.brand}}" ng-bind="::product.brand" ng-if="product.standard == 0"></td>
+                <td class="text-center" title="{{product.pbranden}}" ng-bind="::product.pbranden" ng-if="product.standard == 1"></td>
                 <td class="text-center" title="单位" ng-bind="::product.unit"></td>
                 <td class="text-center">
              	      <span class="checkbox" style="width: 100%;"> 销售

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

@@ -270,20 +270,20 @@
                 <td class="text-center" title="{{product.code}}" ng-bind="::product.code"></td>
                 <td class="line-h20 first text-center">
                     <div class="order-main">
-                        <a ng-bind="::product.title" ui-sref="sale.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.kind == null"></a>
-                        <a ng-bind="::product.kind" ui-sref="sale.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.kind != null"></a>
+                        <a ng-bind="::product.title" ui-sref="sale.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.standard == 0"></a>
+                        <a ng-bind="::product.kind" ui-sref="sale.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.standard == 1"></a>
                     </div>
                 </td>
                <td class="hover-show text-center" ng-class="{'bg01' : product.cmpUuId != null && product.cmpCode != null , 'bg02' : product.cmpUuId == null && product.cmpCode != null , '': product.cmpCode == null}" ng-if="product.pcmpcode == null">
                 	<a href="http://www.usoftmall.com/product#/component/{{product.cmpUuId}}/" title="产品型号" ng-bind="::product.cmpCode"  target="_blank" ng-if="product.cmpUuId != null"></a>
-                	<span title="产品型号" ng-bind="::product.cmpCode" ng-if="product.cmpUuId == null"></span>
+                	<span title="产品型号" ng-bind="::product.cmpCode" ng-if="product.standard == 0"></span>
                 </td>
                 <td class="hover-show text-center" ng-class="{'bg01' : product.cmpUuId != null && product.cmpCode != null , 'bg02' : product.cmpUuId == null && product.cmpCode != null , '': product.cmpCode == null}" ng-if="product.pcmpcode != null">
                 	<a href="http://www.usoftmall.com/product#/component/{{product.cmpUuId}}/" title="产品型号" ng-bind="::product.pcmpcode"  target="_blank" ng-if="product.cmpUuId != null"></a>
-                	<span title="产品型号" ng-bind="::product.pcmpcode" ng-if="product.cmpUuId == null"></span>
+                	<span title="产品型号" ng-bind="::product.pcmpcode" ng-if="product.standard == 1"></span>
                 </td>
-               <td class="line-h20 text-center" title="{{product.brand}}" ng-bind="::product.brand" ng-if="product.pbranden == null"></td>
-                <td class="line-h20 text-center" title="{{product.pbranden}}" ng-bind="::product.pbranden" ng-if="product.pbranden != null"></td>
+               <td class="line-h20 text-center" title="{{product.brand}}" ng-bind="::product.brand" ng-if="product.standard == 0"></td>
+                <td class="line-h20 text-center" title="{{product.pbranden}}" ng-bind="::product.pbranden" ng-if="product.standard == 1"></td>
                 <td class="text-center" title="单位" ng-bind="::product.unit"></td>
                 <td class="text-center"><a ui-sref="sale.productDetail({id:product.id})" ng-click="isProductEdit()" target="_self" title="编辑" style="position: relative;top:1px;"><i class="fa fa-lg fa-edit"></i></a>|<a ng-click="deleteById(product.id)"  title="删除"><i class="fa fa-lg fa-trash"></i></a></td>
             </tr>

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

@@ -251,20 +251,20 @@
                 <td class="text-center" title="{{product.code}}" ng-bind="::product.code"></td>
                 <td class="line-h20 first text-center">
                     <div class="order-main">
-                        <a ng-bind="::product.title" ui-sref="purc.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.kind == null"></a>
-                        <a ng-bind="::product.kind" ui-sref="purc.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.kind != null"></a>
+                        <a ng-bind="::product.title" ui-sref="purc.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.standard == 0"></a>
+                        <a ng-bind="::product.kind" ui-sref="purc.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.standard == 1"></a>
                     </div>
                 </td>
                <td class="hover-show text-center" ng-class="{'bg01' : product.cmpUuId != null && product.cmpCode != null , 'bg02' : product.cmpUuId == null && product.cmpCode != null , '': product.cmpCode == null}" ng-if="product.pcmpcode == null">
                 	<a href="http://www.usoftmall.com/product#/component/{{product.cmpUuId}}/" title="产品型号" ng-bind="::product.cmpCode"  target="_blank" ng-if="product.cmpUuId != null"></a>
-                	<span title="产品型号" ng-bind="::product.cmpCode" ng-if="product.cmpUuId == null"></span>
+                	<span title="产品型号" ng-bind="::product.cmpCode" ng-if="product.standard == 0"></span>
                 </td>
                 <td class="hover-show text-center" ng-class="{'bg01' : product.cmpUuId != null && product.cmpCode != null , 'bg02' : product.cmpUuId == null && product.cmpCode != null , '': product.cmpCode == null}" ng-if="product.pcmpcode != null">
                 	<a href="http://www.usoftmall.com/product#/component/{{product.cmpUuId}}/" title="产品型号" ng-bind="::product.pcmpcode"  target="_blank" ng-if="product.cmpUuId != null"></a>
-                	<span title="产品型号" ng-bind="::product.pcmpcode" ng-if="product.cmpUuId == null"></span>
+                	<span title="产品型号" ng-bind="::product.pcmpcode" ng-if="product.standard == 1"></span>
                 </td>
-                <td class="line-h20 text-center" title="{{product.brand}}" ng-bind="::product.brand" ng-if="product.pbranden == null"></td>
-                <td class="line-h20 text-center" title="{{product.pbranden}}" ng-bind="::product.pbranden" ng-if="product.pbranden != null"></td>
+                <td class="line-h20 text-center" title="{{product.brand}}" ng-bind="::product.brand" ng-if="product.standard == 0"></td>
+                <td class="line-h20 text-center" title="{{product.pbranden}}" ng-bind="::product.pbranden" ng-if="product.standard == 1"></td>
                 <td class="text-center" title="单位" ng-bind="::product.unit"></td>
                  <td class="text-center"><a ui-sref="sale.productDetail({id:product.id})" target="_self" title="编辑" style="position: relative;top:1px;"><i class="fa fa-lg fa-edit"></i></a>|<a ng-click="deleteById(product.id)"  title="删除"><i class="fa fa-lg fa-trash"></i></a></td>
             </tr>