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

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

@@ -79,10 +79,10 @@
 
 <script>
 import { createNamespacedHelpers, mapState, mapActions } from 'vuex'
-
 import { getLodop } from '@/util/LodopFuncs'
-
 import { formatTimeBySeconds } from '@/util/util'
+import { replaceURLParams } from '@/util/ajax'
+
 // const WebSocket = require('ws')
 const { mapState: mapOrderState, mapActions: mapOrderActions } = createNamespacedHelpers('goodsorder')
 
@@ -257,9 +257,12 @@ export default {
     },
     initWebSocket () {
       // console.log(this.user)
+      const wsPath = this.$api.system.notify.newGoodsOrders.url
+      const wsRealPath = replaceURLParams(wsPath, { grps: caseid, id })
+
       let caseid = this.caseid
       let id = this.userInfo.UserId
-      const wsuri = `${window.location.origin.replace('http', 'ws')}/api-v2/common/MQ/websocket/${caseid}/${id}?token=${localStorage.getItem('JWT')}`
+      const wsuri = `${window.location.origin.replace('http', 'ws')}${wsRealPath}?token=${localStorage.getItem('JWT')}`
       // const wsuri = `ws://192.168.0.11/api/guest/MQ/websocket/${caseid}/${id}`
       try {
         this.websock = new WebSocket(wsuri)
@@ -275,14 +278,14 @@ export default {
     websocketonmessage (e) {
       // let oldList = this.list
       let newList = JSON.parse(e.data).data.refreshOnlineGoodsOrders
-      let newinfo = newList.filter(x => this.list.filter(item => item.OrdersId === x.OrdersId).length === 0)
-      this.updateList({ list: newList }).then(() => {
-        for (let i = 0; i < newinfo.length; i++) {
-          this.printPdf(`item_${newinfo[i].OrdersId}`)
+      // let newinfo = newList.filter(x => this.list.filter(item => item.OrdersId === x.OrdersId).length === 0)
+      this.updateList({ list: this.list.concat(newList) }).then(() => {
+        newList.forEach((it) => {
+          this.printPdf(`item_${it.OrdersId}`)
           this.putPrintGoodsOrder({
-            id: newinfo[i].OrdersId
+            id: it.OrdersId
           })
-        }
+        })
       })
     },
     open () {

src/util/ajax.js

@@ -26,17 +26,14 @@ const Axios = axios.create({
 
 Axios.interceptors.request.use((config) => {
   config.headers.authorization = token()
-  config.urlData = { ...config.urlData, org: 'MQ' }
+  // config.urlData = { ...config.urlData,  }
   // 处理请求data,若为get请求，拼到url后面，若为post请求，直接添加到body中
   let urlData = qs.stringify(config.urlData)
   let queryData = qs.stringify(config.queryData)
   // 判断是通过斜杠传参
   if (config.url.indexOf(':') > -1) {
     if (typeof config.urlData === 'object') {
-      config.url = Object.keys(config.urlData).reduce((url, k) => { // 此方法对每个元素进行处理
-        const re = new RegExp(`:${k}(?!w)`, 'i')
-        return url.replace(re, config.urlData[k])
-      }, config.url)
+      config.url = replaceURLParams(config.url, config.urlData)
     } else {
       config.url = config.url.slice(0, config.url.indexOf(':')) + urlData
     }
@@ -83,3 +80,12 @@ const ajax = (...args) => {
 }
 
 export default ajax
+
+export function replaceURLParams(url, params) {
+  const args = { ...(params || {}), org: 'MQ' }
+
+  return Object.keys(args).reduce((acc, k) => { // 此方法对每个元素进行处理
+    const re = new RegExp(`:${k}(?!w)`, 'i')
+    return acc.replace(re, args[k])
+  }, url)
+}

src/util/api.js

@@ -23,6 +23,12 @@ const $api = {
       method: 'put',
       url: `${baseUrl}${common}/user/:id/password`
     },
+    notify: {
+      newGoodsOrders: {
+        method: 'put',
+        url: `${baseUrl}${common}/websocket/:grps/:id`
+      },
+    },
   },
   systemSet: {
     getUserList: { // 获取用户列表