From c868c071c93d30c8c728520e09d00c84d460c672 Mon Sep 17 00:00:00 2001
From: qiankunpingtai <qiankunpingtai@163.com>
Date: Tue, 12 Mar 2019 16:13:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E4=BB=93=E5=BA=93=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=98=BE=E7=A4=BA=E6=97=B6undefined=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=8B=BC=E6=8E=A5=E4=B8=8D=E5=8F=8B=E5=A5=BD?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E5=81=9A=E7=89=B9=E6=AE=8A=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/manage/depot.html | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/erp_web/pages/manage/depot.html b/erp_web/pages/manage/depot.html
index f7027f24..2dc19289 100644
--- a/erp_web/pages/manage/depot.html
+++ b/erp_web/pages/manage/depot.html
@@ -121,6 +121,17 @@
             }
         });
     }
+    /**
+     * 2019-03-08
+     * 对于undefined字段直接拼接不友好的情况做特殊处理
+     * 将undefined转为''后再拼接
+     * */
+    function transferUndefined(obj){
+        if(obj==undefined){
+            return '';
+        }
+        return obj;
+    }
 
     //初始化表格数据
     function initTableData() {
@@ -153,7 +164,7 @@
                     formatter: function (value, rec) {
                         var str = '';
                         var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark + 'AaBb'
-                            + rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage+rec.principalName+rec.principal;
+                            + rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage+ transferUndefined(rec.principalName)+transferUndefined(rec.principal);
                         str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
                         str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>';
                         return str;