Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/system/newOrder/newOrderList/index.vue

@@ -30,7 +30,7 @@
           <div style="padding:25px 20px 5px;border-bottom:2px solid #cccccc;">
             <i class="iconfont icon-yinchenglogo" style="font-size:70px;color:red;position: relative;bottom: 20px;margin-right:10px;"></i>
             <div style="display:inline-block;">
-              <span style="display:block;font-size:20px;font-weight:700;width:180px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{item.AreaName + item.TableNo}}</span>
+              <span style="display:block;font-size:20px;font-weight:700;width:180px;white-space: initial;">{{item.AreaName + item.TableNo}}</span>
               <span style="display:block;margin-top:10px">下单时间：{{toolClass.dateFormat(item.CreateDate)}}</span>
               <span style="display:block;margin-top:10px">已等待：<span style="color:red;font-weight:700;">{{leftTimes[item.OrdersId]}}</span></span>
             </div>
@@ -249,7 +249,7 @@ export default {
       let newData = JSON.parse(e.data).data.refreshOnlineGoodsOrders.slice(lengthOld - lengthNew)
       this.updateList(JSON.parse(e.data).data.refreshOnlineGoodsOrders).then(() => {
         for (let i = 0; i < newData.length; i++) {
-          let index = newData[i].indexOf(this.list)
+          let index = this.list.indexOf(newData[i])
           this.printPdf(`item${index}`)
         }
       })