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

src/pages/system/dataStatistics/goodsOrderList/index.vue

         <td v-if="index%2 !== 0" colspan="2">
           <el-button
           size="mini"
-          type="success">重打</el-button>
+          type="success" @click="printPdf(`item${(index + 1) / 2}`)">重打</el-button>
         </td>
+        <div v-if="index%2 !== 0" class="print-area" :class="'item' + (index + 1) / 2" style="width:180px;left:0;position: absolute;opacity: 0;">
+          <div style="padding:0px 10px 5px;border-bottom:2px solid #cccccc;">
+            <div style="display:inline-block;">
+              <img class="topIcon" style="display:block;width:60%;margin:0 0 20px 0px;" src="http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/111101940020.png" alt="">
+              <span style="display:block;font-size:20px;font-weight:700;text-align: center;">{{returnListItem(goodsOrderList, index).AreaName}}{{returnListItem(goodsOrderList, index).TableNo}}</span>
+            </div>
+          </div>
+          <div style="padding:10px 10px 5px;border-bottom:1px solid #cccccc;" v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">
+            <div style="font-size:12px;"><span style="display:inline-block;width:75%;text-align:left;">{{subItem.GoodsName}}</span><span style="display:inline-block;width:22%;text-align:right;font-size:12px;" v-if='!subItem.SpecName'>× {{subItem.Number}}</span></div>
+            <div style="margin-top:8px;" v-if='subItem.SpecName'>
+              <span style="display:inline-block;width:75%;text-align:left;color:#cccccc;font-size:12px;">{{subItem.SpecName}}</span>
+              <span style="display:inline-block;width:20%;text-align:right;font-size:12px;">× {{subItem.Number}}</span>
+            </div>
+          </div>
+          <div style="padding:10px 10px 5px;border-bottom:1px solid #cccccc;">
+            <div style="font-size:12px;">下单人：{{returnListItem(goodsOrderList, index).CustomerName}}</div>
+            <span style="display:block;margin-top:10px;font-size:12px;">下单时间：{{toolClass.dateFormat(returnListItem(goodsOrderList, index).CreateDate)}}</span>
+          </div>
+          <div style="padding:10px 10px;font-size:12px;">备注：{{returnListItem(goodsOrderList, index).Remark}}</div>
+          <div style="text-align: right;font-size: 12px;">城的空间.诚咖啡</div>
+          <div style="height:10px"></div>
+        </div>
       </tr>
     </table>
     <el-pagination
 
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex'
+import { getLodop } from '@/util/LodopFuncs'
 import tableSearch from '@/components/tableSearch/index'
 const { mapState: mapStaState, mapActions: mapStaActions } = createNamespacedHelpers('sta')
-
+var LODOP
 export default {
   name: '',
   data () {
         this.total = res.total
       })
     },
+    printPdf (cl) {
+      this.CreateOneFormPage(cl)
+      LODOP.PRINT()
+      // LODOP.PREVIEW()
+    },
+    CreateOneFormPage (cl) {
+      LODOP = getLodop()
+      LODOP.PRINT_INIT('订单')
+      LODOP.SET_PRINT_PAGESIZE(3, 480, 40, '')
+      LODOP.ADD_PRINT_HTM(0, 0, document.getElementsByClassName(cl)[0].offsetWidth, document.getElementsByClassName(cl)[0].offsetHeight, document.getElementsByClassName(cl)[0].innerHTML)
+    },
     exportExcel () {
       window.location.href = `${this.toolClass.ReplaceOrg(this.$api.statistics.goodsOrderExcel.url)}?token=${localStorage.getItem('JWT')}`
     },

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

           <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;">{{item.AreaName}}</span>
+              <span style="display:block;font-size:20px;font-weight:700;">{{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>
           </div>
           <div style="padding:10px 20px 5px;border-bottom:1px solid #cccccc;" v-for='(item1,index1) in item.Goods' :key='index1'>
-            <div style="display:flex;justify-content: space-between;align-items: center;"><span>{{item1.GoodsName}}</span><span style="display:inline-block;width:20%;text-align:right" v-if='!item1.SpecName'>x {{item1.Number}}</span></div>
+            <div style="display:flex;justify-content: space-between;align-items: center;padding-right: 10px;"><span>{{item1.GoodsName}}</span><span style="display:inline-block;width:20%;text-align:right" v-if='!item1.SpecName'>× {{item1.Number}}</span></div>
             <div style="margin-top:8px;" v-if='item1.SpecName'>
               <span style="display:inline-block;width:75%;text-align:left;color:#cccccc">{{item1.SpecName}}</span>
               <span style="display:inline-block;width:20%;text-align:right">× {{item1.Number}}</span>
             </div>
           </div>
           <div style="padding:10px 10px 5px;border-bottom:1px solid #cccccc;" v-for='(item1,index1) in item.Goods' :key='index1'>
-            <div style="display:flex;justify-content: space-between;align-items: center;font-size:12px;"><span>{{item1.GoodsName}}</span><span style="display:inline-block;width:20%;text-align:right;font-size:12px;" v-if='!item1.SpecName'>x {{item1.Number}}</span></div>
+            <div style="font-size:12px;"><span style="display:inline-block;width:75%;text-align:left;">{{item1.GoodsName}}</span><span style="display:inline-block;width:22%;text-align:right;font-size:12px;" v-if='!item1.SpecName'>× {{item1.Number}}</span></div>
             <div style="margin-top:8px;" v-if='item1.SpecName'>
               <span style="display:inline-block;width:75%;text-align:left;color:#cccccc;font-size:12px;">{{item1.SpecName}}</span>
               <span style="display:inline-block;width:20%;text-align:right;font-size:12px;">× {{item1.Number}}</span>
         })
         return
       }
-      this.getBusinessStatus(this.caseid)
       clearInterval(this.interval)
       this.GetOrdersList({ caseid: this.caseid }).then(() => {
-        if (this.business) {
-          this.initWebSocket()
-        }
+        this.getBusinessStatus(this.caseid).then(() => {
+          if (this.businessStatus) {
+            this.initWebSocket()
+          }
+        })
         this.interval = setInterval(() => {
           const now = (new Date()).valueOf()
           this.leftTimes = this.list.reduce((acc, it) => {
       'updateSystemInfo'
     ]),
     submit (id) {
-      console.log(id)
       this.$confirm('确定完成此饮品?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         })
         return
       }
-      this.openBusiness(this.caseid)
+      this.openBusiness(this.caseid).then(() => {
+        this.init()
+      })
     },
     close () {
       if (!this.caseid) {

src/pages/system/newOrder/newOrderList/page.scss

 .order-list-box{
   padding: 50px;
-  border-radius: 3px;
   overflow: scroll;
-  width: auto;
-  height: 600px;
+  width: 100%;
   margin-top: 10px;
+  box-sizing: border-box;
+  white-space: nowrap;
   >div{
     display: inline-block;
     width:300px;
     margin:20px;
     box-shadow: 0px 2px 10px 0px rgba(193, 204, 217, 0.5);
     padding-bottom: 10px;
+    vertical-align: top;
   }
   .print-area{
     position: absolute;

src/util/ajax.js

     localStorage.setItem('JWT', headers.authorization)
     JWT = headers.authorization
   }
-  console.log(JWT)
   return JWT ? JWT : localStorage.getItem('JWT') // eslint-disable-line
 }
 
   console.log(error)
 })
 
-// Axios.interceptors.response.use((res) => {
-//   // return new Promise((resolve, reject) => {
-//   //   if (res.data.code === 200) {
-//   //     resolve(res.data.result)
-//   //   } else if (res.data.code === 401) {
-//   //     router.push({ name: 'login' })
-//   //     reject(res.data)
-//   //   } else {
-//   //     Message({
-//   //       message: res.data.message,
-//   //       type: 'error'
-//   //     })
-//   //     reject(res.data)
-//   //   }
-//   // })
-// }, (error) => {
-//   console.log(error)
-// })
-
 const ajax = (...args) => {
   return new Promise((resolve, reject) => {
     Axios(...args).then(({ data, headers }) => {