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

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

             </div>
           </div>
           <div style="padding:10px 20px;border-bottom:1px solid #cccccc">备注：{{item.Remark}}</div>
-          <div style="padding:10px 20px;">下单人：{{item.UserName}}</div>
+          <div style="padding:10px 20px;" @click="printPdf(`item${index}`)">下单人：{{item.UserName}}</div>
         </div>
         <div class="print-area" :class="'item' + index" style="width:180px;">
-          <div style="padding:25px 20px 5px;border-bottom:2px solid #cccccc;">
+          <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 10px;" src="http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/111101940020.png" alt="">
-              <span style="display:block;font-size:20px;font-weight:700;"> <img width='25px' height="25px" src="http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/111101940020.png" alt=""> {{item.AreaName}}</span>
-              <span style="display:block;margin-top:10px;font-size:12px;">下单时间：{{toolClass.dateFormat(item.CreateDate)}}</span>
+              <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;"> <img width='25px' height="25px" :src='item.AreaIconWhite' alt=""> {{item.AreaName}}</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="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="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>
             </div>
           </div>
-          <div style="padding:10px 20px;border-bottom:1px solid #cccccc">备注：{{item.Remark}}</div>
+          <div style="padding:10px 10px 5px;border-bottom:1px solid #cccccc;">
+            <div style="font-size:12px;">下单人：{{item.UserName}}</div>
+            <span style="display:block;margin-top:10px;font-size:12px;">下单时间：{{toolClass.dateFormat(item.CreateDate)}}</span>
+          </div>
+          <div style="padding:10px 10px;font-size:12px;">备注：{{item.Remark}}</div>
+          <div style="text-align: right;font-size: 12px;">城的空间.诚咖啡</div>
+          <div style="height:10px"></div>
         </div>
         <div class="btns">
-          <span @click="cancel(item.id)">取消</span>
-          <span @click="submit(item.id)">确定</span>
+          <span @click="cancel(item.OrdersId)">取消</span>
+          <span @click="submit(item.OrdersId)">确定</span>
         </div>
       </div>
     </div>
       'closeBusiness',
       'checkOrder',
       'cancelOrder',
-      'getBusinessStatus'
+      'getBusinessStatus',
+      'updateList'
     ]),
     ...mapActions([
       'updateSystemInfo'
     ]),
     submit (id) {
+      console.log(id)
       this.$confirm('确定完成此饮品?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then((res) => {
-        this.checkOrder().then(() => {
+        this.checkOrder({ id: id }).then(() => {
           this.$message({
             type: 'success',
             message: '确认订单成功'
           })
+          this.init()
         })
       }).catch((res) => {
         this.$message({
         cancelButtonText: '取消',
         type: 'warning'
       }).then((res) => {
-        this.cancelOrder().then(() => {
+        this.cancelOrder({ id: id }).then(() => {
           this.$message({
             type: 'success',
             message: '取消订单成功'
           })
+          this.init()
         })
       }).catch((res) => {
         this.$message({
       console.log(this.user)
       let caseid = this.caseid
       let id = this.userInfo.UserId
-      // const wsuri = `${window.location.origin.replace('http', 'ws')}/api/common/MQ/websocket/${caseid}/${id}`
-      const wsuri = `ws://192.168.0.11/api/guest/MQ/websocket/${caseid}/${id}`
+      const wsuri = `${window.location.origin.replace('http', 'ws')}/api/common/MQ/websocket/${caseid}/${id}`
+      // const wsuri = `ws://192.168.0.11/api/guest/MQ/websocket/${caseid}/${id}`
       try {
         this.websock = new WebSocket(wsuri)
       } catch (e) {
       let lengthOld = this.list.length
       let lengthNew = JSON.parse(e.data).data.refreshOnlineGoodsOrders.length
       let newData = JSON.parse(e.data).data.refreshOnlineGoodsOrders.slice(lengthOld - lengthNew)
-      this.list = JSON.parse(e.data).data.refreshOnlineGoodsOrders
-      for (let i = 0; i < newData.length; i++) {
-        let index = newData.indexOf(this.list)
-        this.printPdf(`item${index}`)
-      }
+      this.updateList(JSON.parse(e.data).data.refreshOnlineGoodsOrders).then(() => {
+        for (let i = 0; i < newData.length; i++) {
+          let index = newData[i].indexOf(this.list)
+          this.printPdf(`item${index}`)
+        }
+      })
     },
     open () {
       if (!this.caseid) {

src/store/goods/order.js

         }
       })
     },
+    updateList ({ commit }, data) {
+      return new Promise((resolve) => {
+        commit('updateList', data)
+        resolve()
+      })
+    },
     openBusiness ({ commit }, caseid) {
       return new Promise((resolve) => {
         ajax(api.goodsOrder.openBusiness.url, {
             id: caseid
           }
         }).then(res => {
-          commit('updateBusiness', res)
+          let status
+          if (res.Status === 1) {
+            status = true
+          } else {
+            status = false
+          }
+          commit('updateBusiness', status)
           resolve(res)
         })
       })
     checkOrder ({ commit }, data) {
       return new Promise((resolve) => {
         ajax(api.goodsOrder.checkOrder.url, {
-          method: api.goodsOrder.checkOrder.method
+          method: api.goodsOrder.checkOrder.method,
+          urlData: {
+            id: data.id
+          }
         }).then(res => {
           resolve(res)
         })
     cancelOrder ({ commit }, data) {
       return new Promise((resolve) => {
         ajax(api.goodsOrder.cancelOrder.url, {
-          method: api.goodsOrder.cancelOrder.method
+          method: api.goodsOrder.cancelOrder.method,
+          urlData: {
+            id: data.id
+          }
         }).then(res => {
           resolve(res)
         })

src/util/api.js

     getBusinessStatus: {
       method: 'get',
       url: `${baseUrl}${common}/case/conf/:id`
+    },
+    checkOrder: {
+      method: 'put',
+      url: `${baseUrl}${common}/order/goods/finish/:id`
+    },
+    cancelOrder: {
+      method: 'put',
+      url: `${baseUrl}${common}/order/goods/cancel/:id`
     }
   },
   cardManager: {

src/util/util.js

 }
 
 export function formatTimeBySeconds (ms) {
-  const hs = ms / 3600000 | 0
-  const min = (ms - (hs * 3600000)) / 60000 | 0
-  const sec = (ms - (hs * 3600000) - (min * 60000)) / 1000 | 0
-
+  let hs = ms / 3600000 | 0
+  let min = (ms - (hs * 3600000)) / 60000 | 0
+  let sec = (ms - (hs * 3600000) - (min * 60000)) / 1000 | 0
+  hs = hs < 10 ? '0' + hs : hs
+  min = min < 10 ? '0' + min : min
+  sec = sec < 10 ? '0' + sec : sec
   return hs > 0 ? `${hs}:${min}:${sec}` : `${min}:${sec}`
 }