浏览代码

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

许成详 6 年前
父节点
当前提交
595e250b8a
共有 2 个文件被更改,包括 4 次插入5 次删除
  1. 1
    1
      dist/index.html
  2. 3
    4
      src/pages/system/newOrder/newOrderList/index.vue

+ 1
- 1
dist/index.html 查看文件

@@ -1 +1 @@
1
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.da6f5d0be226c62d85ab6affc245d329.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.01455eb793de834a6b0b.js></script></body></html>
1
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.ddd3e8ee05b5a16ce2dc1b46b188c78d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.340c2242190d5ca52316.js></script><script type=text/javascript src=./static/js/app.b7544dd4ce21aa7a1107.js></script></body></html>

+ 3
- 4
src/pages/system/newOrder/newOrderList/index.vue 查看文件

@@ -278,10 +278,9 @@ export default {
278 278
       let newinfo = newList.filter(x => this.list.filter(item => item.OrdersId === x.OrdersId).length === 0)
279 279
       this.updateList({ list: newList }).then(() => {
280 280
         for (let i = 0; i < newinfo.length; i++) {
281
-          this.printPdf(`item_${newinfo[i].OrdersId}`).then(() => {
282
-            this.putPrintGoodsOrder({
283
-              id: newinfo[i].OrdersId
284
-            })
281
+          this.printPdf(`item_${newinfo[i].OrdersId}`)
282
+          this.putPrintGoodsOrder({
283
+            id: newinfo[i].OrdersId
285 284
           })
286 285
         }
287 286
       })