Browse Source

增加ERP操作日志显示

hejq 7 years ago
parent
commit
1b8db5e50f

+ 1 - 0
src/main/webapp/WEB-INF/views/normal/noticeDetail.html

@@ -114,6 +114,7 @@
                     <th class="text-center" width="50">结案状态</th>
                     <th class="text-center" width="50">发货状态</th>
                     <th class="text-center" width=100">录单时间</th>
+                    <th class="text-center" width=200">ERP操作日志</th>
                     <th class="text-center" width=100">备注</th>
                     </thead>
                     <tbody id="detail-body">

+ 9 - 4
src/main/webapp/resources/js/common/noticeDetail.js

@@ -98,16 +98,21 @@ function getDataRow(detail, i) {
 
     var remarkCell = document.createElement('td'); //时间
     remarkCell.setAttribute("class", "text-center");
+    remarkCell.innerHTML = detail.remark;//填充数据
+    row.appendChild(remarkCell);
+
+    var tipCell = document.createElement('td'); //时间
+    tipCell.setAttribute("class", "text-center");
     if (detail.okStatus == 1) {
-        remarkCell.innerHTML = '正常';
+        tipCell.innerHTML = '正常';
     } else {
         if (detail.b2bId == -1) {
-            remarkCell.innerHTML = '<span style="color: red;">B2B未找到对应单据</span>';
+            tipCell.innerHTML = '<span style="color: red;">B2B未找到对应单据</span>';
         } else {
-            remarkCell.innerHTML = '<span style="color: red;">异常</span>'; //填充数据
+            tipCell.innerHTML = '<span style="color: red;">异常</span>'; //填充数据
         }
     }
-    row.appendChild(remarkCell);
+    row.appendChild(tipCell);
 
     return row;
 }