页面数据显示异常处理

src/main/webapp/WEB-INF/views/normal/deputyOrderList.html

@@ -113,7 +113,7 @@
 			<input id="deputyList-total" style="width: 100px; border:0;outline:0;background: #F7F7F8" readonly>
 		</div>
         <div class="input-group">
-            <input type="text" id="keyword" class="form-control" placeholder="请输入流水号或者采购单号搜索"><span class="input-group-addon" id="p_search">搜索</span>
+            <input type="text" id="keyword" class="form-control" placeholder="请输入流水号或者订单编号搜索"><span class="input-group-addon" id="p_search">搜索</span>
         </div>
     </div>
 	<table class="table table-striped table-hover" style="overflow: scroll">
@@ -121,7 +121,7 @@
             <th class="text-center" width="60">序号</th>
             <th class="text-center" width="80">订单信息</th>
             <th class="text-center" width="120">采购企业</th>
-            <th class="text-center" width="120">终端供应商</th>
+            <th class="text-center" width="120">供应商</th>
             <th class="text-center" width="80">单据状态</th>
 			<th class="text-center" width="100">时间</th>
             <th class="text-center" width="50">操作</th>

src/main/webapp/resources/js/account/enterprise.js

@@ -115,16 +115,12 @@ function getDataRow(en, i) {
 
     var addressCell = document.createElement('td'); //企业地址
     addressCell.setAttribute("class", "text-center");
-    if (en.enAddress != null) {
-        addressCell.innerHTML = highLightKeywords(en.enAddress, keyword, null); //填充数据
-    } else {
-        addressCell.innerHTML = '-';
-    }
+    addressCell.innerHTML = highLightKeywords(en.enAddress || "-", keyword, null); //填充数据
     row.appendChild(addressCell);
 
     var busiCodeCell = document.createElement('td'); //营业执照
     busiCodeCell.setAttribute("class", "text-center");
-    busiCodeCell.innerHTML = highLightKeywords(en.enBussinessCode, keyword, null); //填充数据
+    busiCodeCell.innerHTML = highLightKeywords(en.enBusinessCode, keyword, null); //填充数据
     row.appendChild(busiCodeCell);
 
     var dateCell = document.createElement('td'); //注册日期

src/main/webapp/resources/js/common/deputyOrder.js

@@ -146,21 +146,21 @@ function getDataRow(order, i) {
     // 订单信息
     var uuCell = document.createElement('td');
     uuCell.setAttribute("class", "text-left");
-    uuCell.innerHTML = "流水号：" + highLightKeywords(order.code, keyword, null); //填充数据
-    uuCell.innerHTML += "<br>订单号编号：" + highLightKeywords(order.salecode, keyword, null); ;
+    uuCell.innerHTML = "流水号： " + highLightKeywords(order.code, keyword, null); //填充数据
+    uuCell.innerHTML += "<br>订单编号： " + highLightKeywords(order.salecode || "-", keyword, null);
     row.appendChild(uuCell);
 
     // 采购企业
     var nameCell = document.createElement('td');
     nameCell.setAttribute("class", "text-left");
-    nameCell.innerHTML = "企业名称：" + order.enName; //填充数据
-    nameCell.innerHTML += "<br>企业UU：" + order.enuu;
+    nameCell.innerHTML = "企业名称： " + order.enName; //填充数据
+    nameCell.innerHTML += "<br>企业UU： " + order.enuu;
     row.appendChild(nameCell);
 
     // 终端供应商
     var vendorCell = document.createElement('td');
     vendorCell.setAttribute("class", "text-left");
-    vendorCell.innerHTML = "代采企业: " + order.deputyname;
+    vendorCell.innerHTML = "代采企业:  " + order.deputyname;
     vendorCell.innerHTML += "<br>终端供应商： " + order.tervendor;
     row.appendChild(vendorCell);
 
@@ -174,8 +174,8 @@ function getDataRow(order, i) {
     // 日期
     var dateCell = document.createElement('td'); //日期
     dateCell.setAttribute("class", "text-center");
-    dateCell.innerHTML = "录入时间：" + formatDateTime(order.entrydate) || "-"; //填充数据
-    dateCell.innerHTML += "<br>提交时间：" + formatDateTime(order.date) || "-"; //填充数据
+    dateCell.innerHTML = "录入时间： " + formatDateTime(order.entrydate) || "-"; //填充数据
+    dateCell.innerHTML += "<br>提交时间： " + formatDateTime(order.date) || "-"; //填充数据
     row.appendChild(dateCell);
 
     // 操作