Преглед изворни кода

求购添加对类目的非空判断

liusw пре 7 година
родитељ
комит
ae61cc2160

+ 14 - 0
src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -1752,6 +1752,19 @@ define([ 'app/app' ], function(app) {
 		};
 	}]);
 
+    function checkNullStr (str) {
+        const NULL_ARR = ['空', '没', '无', '-', '—', 'null', '#N/A'];
+        var flag = true;
+        NULL_ARR.map(function (s) {  flag = str === s ? false : flag; });
+        return flag;
+    }
+
+    app.filter('nullStrFilter', function () {
+        return function (str) {
+            return checkNullStr(str) ? str : '-'
+        }
+    });
+
   /**
    * 左侧导航栏控制器
    */
@@ -1792,4 +1805,5 @@ define([ 'app/app' ], function(app) {
 		}
 		return arr;
 	};
+
 });

+ 1 - 1
src/main/webapp/resources/view/usercenter/forstore/bomDetail.html

@@ -541,7 +541,7 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.prodTitle}}" class="fl item"><span>类目:</span><div class="content">{{seek.prodTitle || '-'}}</div></div>
+                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item"><span>类目:</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                             <div title="{{seek.cmpCode}}" class="fl item"><span>型号:</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
                             <div title="{{seek.inbrand}}" class="fl item bottom"><span>品牌:</span><div class="content">{{seek.inbrand || '-'}}</div></div>
                             <div title="{{seek.spec}}" class="fl item bottom"><span>规格:</span><div class="content">{{seek.spec || '-'}}</div></div>

+ 1 - 1
src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -823,7 +823,7 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.prodTitle}}" class="fl item"><span>类目:</span><div class="content">{{seek.prodTitle || '-'}}</div></div>
+                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item"><span>类目:</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                             <div title="{{seek.cmpCode}}" class="fl item"><span>型号:</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
                             <div title="{{seek.inbrand}}" class="fl item bottom"><span>品牌:</span><div class="content">{{seek.inbrand || '-'}}</div></div>
                             <div title="{{seek.spec}}" class="fl item bottom"><span>规格:</span><div class="content">{{seek.spec || '-'}}</div></div>

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -659,7 +659,7 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.prodTitle}}" class="fl item"><span>类目:</span><div class="content">{{seek.prodTitle || '-'}}</div></div>
+                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item"><span>类目:</span><div class="content">{{(seek.prodTitle || '-')  | nullStrFilter}}</div></div>
                             <div title="{{seek.cmpCode}}" class="fl item"><span>型号:</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
                             <div title="{{seek.inbrand}}" class="fl item bottom"><span>品牌:</span><div class="content">{{seek.inbrand || '-'}}</div></div>
                             <div title="{{seek.spec}}" class="fl item bottom"><span>规格:</span><div class="content">{{seek.spec || '-'}}</div></div>

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -684,7 +684,7 @@
                     <td>
                         <div class="row-wrap il-content">
                             <div class="il-box-large il-box">
-                                <div title="{{seek.prodTitle}}" class="fl item"><span>类目:</span><div class="content">{{seek.prodTitle || '-'}}</div></div>
+                                <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item"><span>类目:</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                                 <div title="{{seek.cmpCode}}" class="fl item"><span>型号:</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
                                 <div title="{{seek.inbrand}}" class="fl item bottom"><span>品牌:</span><div class="content">{{seek.inbrand || '-'}}</div></div>
                                 <div title="{{seek.spec}}" class="fl item bottom"><span>规格:</span><div class="content">{{seek.spec || '-'}}</div></div>