Merge branch 'dev_优惠券优化' into grey

@@ -214,6 +214,7 @@
             <tr>
             <tr>
                 <th>操作类型</th>
                 <th>操作类型</th>
                 <th>操作人</th>
                 <th>操作人</th>
+                <th>部门</th>
                 <th>执行时间</th>
                 <th>执行时间</th>
             </tr>
             </tr>
             </thead>
             </thead>
@@ -223,6 +224,7 @@
             <tr>
             <tr>
                 <td>[[item.operationType]]</td>
                 <td>[[item.operationType]]</td>
                 <td>[[item.operator]]</td>
                 <td>[[item.operator]]</td>
+                <td>[[item.deptName]]</td>
                 <td>[[item.createTime]]</td>
                 <td>[[item.createTime]]</td>
             </tr>
             </tr>
             [[/each]]
             [[/each]]

@@ -385,6 +385,8 @@ function getOperationRecords(couponId) {
             var data = resp.data;
             var data = resp.data;
             covertOperationRecord(data)
             covertOperationRecord(data)
             $('.historyDetail').html(common.util.__template2($('#operation-record-template').html(), {list: data}));
             $('.historyDetail').html(common.util.__template2($('#operation-record-template').html(), {list: data}));
+        } else {
+            $('.historyDetail').html('<p>查询记录失败!</p>');
         }
         }
     }, true);
     }, true);
 }
 }