浏览代码

修改订单二维码展示 及调整条形码宽高

yangg 1 年之前
父节点
当前提交
2e63e10fe4
共有 74 个文件被更改,包括 340 次插入321 次删除
  1. 1 1
      manager-admin/dist/index.html
  2. 0 0
      manager-admin/dist/static/js/19.95050a55e68b09003950.js
  3. 0 0
      manager-admin/dist/static/js/19.b80a80773ec4477f7b64.js
  4. 二进制
      manager-admin/dist/static/js/19.b80a80773ec4477f7b64.js.gz
  5. 0 0
      manager-admin/dist/static/js/20.4566e46679b4d8abbcbb.js
  6. 0 0
      manager-admin/dist/static/js/21.82e450cecb88de0acd8c.js
  7. 0 0
      manager-admin/dist/static/js/22.919b4e86e51e0c069846.js
  8. 0 0
      manager-admin/dist/static/js/30.6c2eb2165ebb09120bff.js
  9. 二进制
      manager-admin/dist/static/js/30.bdec1d510dae913fa834.js.gz
  10. 0 0
      manager-admin/dist/static/js/31.def794b4eb39e7c61f7d.js
  11. 二进制
      manager-admin/dist/static/js/32.48c49c3656efe0eeaada.js.gz
  12. 0 0
      manager-admin/dist/static/js/32.dafc6eac8298c0916db1.js
  13. 二进制
      manager-admin/dist/static/js/32.dafc6eac8298c0916db1.js.gz
  14. 0 0
      manager-admin/dist/static/js/33.a5adf2b647d47ffad1cf.js
  15. 0 0
      manager-admin/dist/static/js/34.8cd4bb6c56d90b51400d.js
  16. 二进制
      manager-admin/dist/static/js/34.8cd4bb6c56d90b51400d.js.gz
  17. 0 0
      manager-admin/dist/static/js/35.d7cd5c18202e0e3497ec.js
  18. 二进制
      manager-admin/dist/static/js/35.d7cd5c18202e0e3497ec.js.gz
  19. 二进制
      manager-admin/dist/static/js/36.da2fea8de2a884320a7c.js.gz
  20. 0 0
      manager-admin/dist/static/js/36.f344dff53a11dc70891d.js
  21. 二进制
      manager-admin/dist/static/js/36.f344dff53a11dc70891d.js.gz
  22. 0 0
      manager-admin/dist/static/js/37.0c65428158a56d9b2001.js
  23. 二进制
      manager-admin/dist/static/js/37.eeea183a6d82286ff55a.js.gz
  24. 0 0
      manager-admin/dist/static/js/38.38bc67badc2e9721c55b.js
  25. 0 0
      manager-admin/dist/static/js/39.0ce88a3d6b6e47de3b92.js
  26. 0 0
      manager-admin/dist/static/js/40.64f5a5b8a710eef71f8f.js
  27. 二进制
      manager-admin/dist/static/js/40.64f5a5b8a710eef71f8f.js.gz
  28. 0 0
      manager-admin/dist/static/js/41.105519940ff667762160.js
  29. 二进制
      manager-admin/dist/static/js/41.105519940ff667762160.js.gz
  30. 0 0
      manager-admin/dist/static/js/41.bcc09a1b546738f21eb4.js
  31. 二进制
      manager-admin/dist/static/js/41.bcc09a1b546738f21eb4.js.gz
  32. 0 0
      manager-admin/dist/static/js/42.3bc7ef2e016f1c602ea5.js
  33. 二进制
      manager-admin/dist/static/js/42.6c4a5bb3da3f720d6e54.js.gz
  34. 0 0
      manager-admin/dist/static/js/43.37ddb3e5d5f03148bcc0.js
  35. 二进制
      manager-admin/dist/static/js/43.9dd922d728b40b50b952.js.gz
  36. 0 0
      manager-admin/dist/static/js/44.b140ab3ae2a59996b3a3.js
  37. 二进制
      manager-admin/dist/static/js/44.b140ab3ae2a59996b3a3.js.gz
  38. 0 0
      manager-admin/dist/static/js/45.35c5b8fc799ddf2c42d8.js
  39. 二进制
      manager-admin/dist/static/js/45.35c5b8fc799ddf2c42d8.js.gz
  40. 0 0
      manager-admin/dist/static/js/46.7418b356c5279c486cbc.js
  41. 二进制
      manager-admin/dist/static/js/46.7418b356c5279c486cbc.js.gz
  42. 0 0
      manager-admin/dist/static/js/47.c17c770acd8d959a87d3.js
  43. 二进制
      manager-admin/dist/static/js/47.c17c770acd8d959a87d3.js.gz
  44. 二进制
      manager-admin/dist/static/js/47.f13fe3c41907d9ee4091.js.gz
  45. 0 0
      manager-admin/dist/static/js/48.e87348134ca4b28d3a82.js
  46. 0 0
      manager-admin/dist/static/js/49.55335791aa1da3bdaaf5.js
  47. 二进制
      manager-admin/dist/static/js/49.55335791aa1da3bdaaf5.js.gz
  48. 1 1
      manager-admin/dist/static/js/50.2ad874b7bed510a80191.js
  49. 二进制
      manager-admin/dist/static/js/50.8f686eb1bb02332ad97f.js.gz
  50. 二进制
      manager-admin/dist/static/js/51.7158439eb44f6cf81ff2.js.gz
  51. 0 0
      manager-admin/dist/static/js/51.eae4df4d85492ffa641d.js
  52. 二进制
      manager-admin/dist/static/js/51.eae4df4d85492ffa641d.js.gz
  53. 0 0
      manager-admin/dist/static/js/52.2dba719378289dcb3b40.js
  54. 二进制
      manager-admin/dist/static/js/52.2dba719378289dcb3b40.js.gz
  55. 0 0
      manager-admin/dist/static/js/53.186043b414f9b9d03ca1.js
  56. 二进制
      manager-admin/dist/static/js/53.186043b414f9b9d03ca1.js.gz
  57. 0 0
      manager-admin/dist/static/js/54.ccf370f936f89890b081.js
  58. 二进制
      manager-admin/dist/static/js/54.ef974302411bd82e2e03.js.gz
  59. 0 0
      manager-admin/dist/static/js/55.dba44f36fd25dc1d5d5a.js
  60. 0 0
      manager-admin/dist/static/js/56.6207e78e34ee4251ff77.js
  61. 0 0
      manager-admin/dist/static/js/57.599caa9bde73953789aa.js
  62. 0 0
      manager-admin/dist/static/js/58.1c26627b97e8a726cc61.js
  63. 0 0
      manager-admin/dist/static/js/59.26e8fe9e304caacfef40.js
  64. 二进制
      manager-admin/dist/static/js/59.26e8fe9e304caacfef40.js.gz
  65. 0 0
      manager-admin/dist/static/js/app.658e2a9bf51023550279.js
  66. 二进制
      manager-admin/dist/static/js/app.658e2a9bf51023550279.js.gz
  67. 二进制
      manager-admin/dist/static/js/app.ce1cdbf43978e82e25b6.js.gz
  68. 0 0
      manager-admin/dist/static/js/manifest.bd576a5826b936094d00.js
  69. 0 0
      manager-admin/dist/static/js/manifest.dd8ada7b308184bca28e.js
  70. 4 1
      manager-admin/src/views/basicSetting/skuSort.vue
  71. 2 2
      manager-admin/src/views/setting/serialList.vue
  72. 1 1
      manager-admin/src/views/stock/goodsLend.vue
  73. 1 1
      manager-admin/src/views/stock/order.vue
  74. 330 314
      manager-admin/src/views/stock/orderCheck.vue

+ 1 - 1
manager-admin/dist/index.html

@@ -1,3 +1,3 @@
 <!DOCTYPE html><html><head><meta charset=utf-8><script>var ua = window.navigator.userAgent
     var isIe = /MSIE|Trident/.test(ua)
-    // if (isIe) window.location.href = 'http://support.dmeng.net/upgrade-your-browser.html?referrer=' + encodeURIComponent(window.location.href)</script><script src=/static/js/envs.js></script><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>erp</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.2504f4a014a0e06a9efabe33f1571f70.css rel=stylesheet></head><body><div id=app><div style="display: flex;width: 100vw;height: 100vh;justify-content:center;align-items:center"><img src=/static/img/index.ripple-radio-preloader.gif alt=""></div></div><script src=/static/js/jquery.min.js></script><script src=/static/js/xlsx.full.min.js></script><script src=/static/js/echarts.min.js></script><script src=/static/js/base64.min.js></script><script src=/static/js/psl.min.js></script><script src=/static/UE/ueditor.config.js></script><script src=/static/UE/ueditor.all.js></script><script src=/static/UE/lang/zh-cn/zh-cn.js></script><script src=/static/UE/ueditor.parse.js></script><script src="//webapi.amap.com/maps?v=2.0&key=a4553619077791eb0a6df2f450b9a03b&plugin=AMap.CircleEditor"></script><script src=//webapi.amap.com/ui/1.1/main.js></script><script type=text/javascript src=/static/js/manifest.dd8ada7b308184bca28e.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.ce1cdbf43978e82e25b6.js></script></body></html>
+    // if (isIe) window.location.href = 'http://support.dmeng.net/upgrade-your-browser.html?referrer=' + encodeURIComponent(window.location.href)</script><script src=/static/js/envs.js></script><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>erp</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.2504f4a014a0e06a9efabe33f1571f70.css rel=stylesheet></head><body><div id=app><div style="display: flex;width: 100vw;height: 100vh;justify-content:center;align-items:center"><img src=/static/img/index.ripple-radio-preloader.gif alt=""></div></div><script src=/static/js/jquery.min.js></script><script src=/static/js/xlsx.full.min.js></script><script src=/static/js/echarts.min.js></script><script src=/static/js/base64.min.js></script><script src=/static/js/psl.min.js></script><script src=/static/UE/ueditor.config.js></script><script src=/static/UE/ueditor.all.js></script><script src=/static/UE/lang/zh-cn/zh-cn.js></script><script src=/static/UE/ueditor.parse.js></script><script src="//webapi.amap.com/maps?v=2.0&key=a4553619077791eb0a6df2f450b9a03b&plugin=AMap.CircleEditor"></script><script src=//webapi.amap.com/ui/1.1/main.js></script><script type=text/javascript src=/static/js/manifest.bd576a5826b936094d00.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.658e2a9bf51023550279.js></script></body></html>

文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/19.95050a55e68b09003950.js


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/19.b80a80773ec4477f7b64.js


二进制
manager-admin/dist/static/js/20.c131a76a90f2d558c3ce.js.gz → manager-admin/dist/static/js/19.b80a80773ec4477f7b64.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/20.4566e46679b4d8abbcbb.js


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/21.82e450cecb88de0acd8c.js


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/22.919b4e86e51e0c069846.js


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/30.6c2eb2165ebb09120bff.js


二进制
manager-admin/dist/static/js/30.bdec1d510dae913fa834.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/31.def794b4eb39e7c61f7d.js


二进制
manager-admin/dist/static/js/32.48c49c3656efe0eeaada.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/32.dafc6eac8298c0916db1.js


二进制
manager-admin/dist/static/js/34.d3ffdf5f12fb72057d37.js.gz → manager-admin/dist/static/js/32.dafc6eac8298c0916db1.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/33.a5adf2b647d47ffad1cf.js


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/34.8cd4bb6c56d90b51400d.js


二进制
manager-admin/dist/static/js/34.8cd4bb6c56d90b51400d.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/35.d7cd5c18202e0e3497ec.js


二进制
manager-admin/dist/static/js/35.d7cd5c18202e0e3497ec.js.gz


二进制
manager-admin/dist/static/js/36.da2fea8de2a884320a7c.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/36.f344dff53a11dc70891d.js


二进制
manager-admin/dist/static/js/36.f344dff53a11dc70891d.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/37.0c65428158a56d9b2001.js


二进制
manager-admin/dist/static/js/37.eeea183a6d82286ff55a.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/38.38bc67badc2e9721c55b.js


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/39.0ce88a3d6b6e47de3b92.js


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/40.64f5a5b8a710eef71f8f.js


二进制
manager-admin/dist/static/js/40.64f5a5b8a710eef71f8f.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/41.105519940ff667762160.js


二进制
manager-admin/dist/static/js/41.105519940ff667762160.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/41.bcc09a1b546738f21eb4.js


二进制
manager-admin/dist/static/js/41.bcc09a1b546738f21eb4.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/42.3bc7ef2e016f1c602ea5.js


二进制
manager-admin/dist/static/js/42.6c4a5bb3da3f720d6e54.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/43.37ddb3e5d5f03148bcc0.js


二进制
manager-admin/dist/static/js/43.9dd922d728b40b50b952.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/44.b140ab3ae2a59996b3a3.js


二进制
manager-admin/dist/static/js/44.b140ab3ae2a59996b3a3.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/45.35c5b8fc799ddf2c42d8.js


二进制
manager-admin/dist/static/js/46.413dd37a802042c07ead.js.gz → manager-admin/dist/static/js/45.35c5b8fc799ddf2c42d8.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/46.7418b356c5279c486cbc.js


二进制
manager-admin/dist/static/js/46.7418b356c5279c486cbc.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/47.c17c770acd8d959a87d3.js


二进制
manager-admin/dist/static/js/48.17ceb78345098ed998ef.js.gz → manager-admin/dist/static/js/47.c17c770acd8d959a87d3.js.gz


二进制
manager-admin/dist/static/js/47.f13fe3c41907d9ee4091.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/48.e87348134ca4b28d3a82.js


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/49.55335791aa1da3bdaaf5.js


二进制
manager-admin/dist/static/js/49.55335791aa1da3bdaaf5.js.gz


+ 1 - 1
manager-admin/dist/static/js/52.77fa8d14ad3d7d30e510.js → manager-admin/dist/static/js/50.2ad874b7bed510a80191.js

@@ -1 +1 @@
-webpackJsonp([52],{P95X:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=e("hky6"),i={data:function(){return{scanSource:"未知扫码来源",sn:"",price:"",payUrl:""}},methods:{goPay:function(){r.v({order_id:this.$route.query.id,pay_type:this.scanSource}).then(function(n){window.open(n)})},detectScanSource:function(){this.price=this.$route.query.price,this.sn=this.$route.query.sn;var n=window.navigator.userAgent.toLowerCase();"micromessenger"==n.match(/MicroMessenger/i)?this.scanSource="wx":"alipayclient"==n.match(/AlipayClient/i)?this.scanSource="ali":this.scanSource="unknown"}},mounted:function(){this.detectScanSource()}},a=e("XyMi");var s=function(n){e("wsQH")},o=Object(a.a)(i,function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("div",{staticClass:"center"},[e("div",{staticClass:"header_info"},[e("p",[n._v("订单编号: "),e("span",[n._v(n._s(n.sn))])]),n._v(" "),e("p",[n._v("付款金额:"),e("span",[n._v(" ¥")]),e("span",[n._v(n._s(n.price))])])]),n._v(" "),e("div",{staticClass:"btn"},[e("el-button",{staticStyle:{width:"100%","font-size":"18px"},attrs:{type:"primary"},on:{click:n.goPay}},[n._v("\n            确认支付\n        ")])],1)])},[],!1,s,"data-v-5b7fdbb8",null);t.default=o.exports},bfTO:function(n,t,e){(n.exports=e("FZ+f")(!1)).push([n.i,"\n.center[data-v-5b7fdbb8] {\r\n    width: 100%;\r\n    padding: 15px;\n}\n.header_info[data-v-5b7fdbb8] {\r\n    border-radius: 10px;\r\n    padding: 10px;\r\n    width: 100%;\r\n    background-color: #fff;\n}\np[data-v-5b7fdbb8] {\r\n    padding-top: 5px;\r\n    padding-bottom: 5px;\n}\n.btn[data-v-5b7fdbb8] {\r\n    width: 100%;\r\n    margin-top: 80px;\n}\r\n",""])},wsQH:function(n,t,e){var r=e("bfTO");"string"==typeof r&&(r=[[n.i,r,""]]),r.locals&&(n.exports=r.locals);e("rjj0")("9e3ee174",r,!0)}});
+webpackJsonp([50],{P95X:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=e("hky6"),i={data:function(){return{scanSource:"未知扫码来源",sn:"",price:"",payUrl:""}},methods:{goPay:function(){r.v({order_id:this.$route.query.id,pay_type:this.scanSource}).then(function(n){window.open(n)})},detectScanSource:function(){this.price=this.$route.query.price,this.sn=this.$route.query.sn;var n=window.navigator.userAgent.toLowerCase();"micromessenger"==n.match(/MicroMessenger/i)?this.scanSource="wx":"alipayclient"==n.match(/AlipayClient/i)?this.scanSource="ali":this.scanSource="unknown"}},mounted:function(){this.detectScanSource()}},a=e("XyMi");var s=function(n){e("wsQH")},o=Object(a.a)(i,function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("div",{staticClass:"center"},[e("div",{staticClass:"header_info"},[e("p",[n._v("订单编号: "),e("span",[n._v(n._s(n.sn))])]),n._v(" "),e("p",[n._v("付款金额:"),e("span",[n._v(" ¥")]),e("span",[n._v(n._s(n.price))])])]),n._v(" "),e("div",{staticClass:"btn"},[e("el-button",{staticStyle:{width:"100%","font-size":"18px"},attrs:{type:"primary"},on:{click:n.goPay}},[n._v("\n            确认支付\n        ")])],1)])},[],!1,s,"data-v-5b7fdbb8",null);t.default=o.exports},bfTO:function(n,t,e){(n.exports=e("FZ+f")(!1)).push([n.i,"\n.center[data-v-5b7fdbb8] {\r\n    width: 100%;\r\n    padding: 15px;\n}\n.header_info[data-v-5b7fdbb8] {\r\n    border-radius: 10px;\r\n    padding: 10px;\r\n    width: 100%;\r\n    background-color: #fff;\n}\np[data-v-5b7fdbb8] {\r\n    padding-top: 5px;\r\n    padding-bottom: 5px;\n}\n.btn[data-v-5b7fdbb8] {\r\n    width: 100%;\r\n    margin-top: 80px;\n}\r\n",""])},wsQH:function(n,t,e){var r=e("bfTO");"string"==typeof r&&(r=[[n.i,r,""]]),r.locals&&(n.exports=r.locals);e("rjj0")("9e3ee174",r,!0)}});

二进制
manager-admin/dist/static/js/50.8f686eb1bb02332ad97f.js.gz


二进制
manager-admin/dist/static/js/51.7158439eb44f6cf81ff2.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/51.eae4df4d85492ffa641d.js


二进制
manager-admin/dist/static/js/51.eae4df4d85492ffa641d.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/52.2dba719378289dcb3b40.js


二进制
manager-admin/dist/static/js/53.aadd2c3baf90889cac90.js.gz → manager-admin/dist/static/js/52.2dba719378289dcb3b40.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/53.186043b414f9b9d03ca1.js


二进制
manager-admin/dist/static/js/53.186043b414f9b9d03ca1.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/54.ccf370f936f89890b081.js


二进制
manager-admin/dist/static/js/54.ef974302411bd82e2e03.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/55.dba44f36fd25dc1d5d5a.js


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/56.6207e78e34ee4251ff77.js


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/57.599caa9bde73953789aa.js


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/58.1c26627b97e8a726cc61.js


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/59.26e8fe9e304caacfef40.js


二进制
manager-admin/dist/static/js/59.26e8fe9e304caacfef40.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/app.658e2a9bf51023550279.js


二进制
manager-admin/dist/static/js/app.658e2a9bf51023550279.js.gz


二进制
manager-admin/dist/static/js/app.ce1cdbf43978e82e25b6.js.gz


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/manifest.bd576a5826b936094d00.js


文件差异内容过多而无法显示
+ 0 - 0
manager-admin/dist/static/js/manifest.dd8ada7b308184bca28e.js


+ 4 - 1
manager-admin/src/views/basicSetting/skuSort.vue

@@ -101,7 +101,7 @@
 
             </div>
             <div style="margin-top: 10px; font-size: 20px; text-align: center">
-              <barcode :value="item" format="CODE128"></barcode>
+              <barcode :value="item" format="CODE128" height="65" width="1"></barcode>
             </div>
           </div>
         </div>
@@ -291,6 +291,9 @@ export default {
 </script>
 
 <style>
+.print {
+  margin-left: 790px;
+}
 .inner-toolbar2 {
   justify-content: flex-start !important;
 }

+ 2 - 2
manager-admin/src/views/setting/serialList.vue

@@ -160,8 +160,8 @@
             <div class="numOrder">
 
             </div>
-            <div style="margin-top: 10px; font-size: 20px; text-align: center">
-              <barcode :value="item" format="CODE128"></barcode>
+            <div  style="margin-top: 10px; font-size: 20px; text-align: center">
+              <barcode :value="item" format="CODE128" height="65" width="1"></barcode>
             </div>
           </div>
         </div>

+ 1 - 1
manager-admin/src/views/stock/goodsLend.vue

@@ -96,7 +96,7 @@
             <el-button type="success" size="mini" style="margin-top: 5px;" v-if="checkPermission(['goodsLend:del'])"
               @click="handleReturnGoodsLend(scope.row)">删除</el-button>
             <!-- v-if="checkPermission(['goodsLend:print'])" -->
-            <el-button type="primary" size="mini" @click="handlePrintGoodsLendDialog(scope.row)">打印</el-button>
+            <el-button type="primary" size="mini" style="margin-top: 5px;" @click="handlePrintGoodsLendDialog(scope.row)">打印</el-button>
           </template>
         </el-table-column>
       </template>

+ 1 - 1
manager-admin/src/views/stock/order.vue

@@ -157,7 +157,7 @@
         </el-table-column>
         <el-table-column label="操作" width="300">
           <template slot-scope="scope">
-            <el-button size="mini" @click="handleAudit(scope.row)">查看</el-button>
+            <el-button size="mini" v-if="checkPermission(['orderCheck'])" @click="handleAudit(scope.row)">查看</el-button>
             <!-- <el-button size="mini" type="success" v-if="scope.row.status === 'TO_BE_COMMIT'"
               @click="handleSubmit(scope.row.id)">确认</el-button> -->
             <el-button size="mini" @click="handleEdit(scope.row)"

+ 330 - 314
manager-admin/src/views/stock/orderCheck.vue

@@ -1,47 +1,50 @@
 <template>
-    <div class="bg-in-stock" ref="printId">
-        <div class="numOrder">
-            <barcode :value="barcodeValue"></barcode>
-        </div>
-        <el-form ref="orderFormRef" :rules="rules" :model="OrderForm" label-width="140px" inline :disabled="isDetail">
-            <h3>基本信息</h3>
-            <el-row>
-                <el-col :span="10">
-                    <el-form-item label="订单类型:" prop="type" :rules="rules.type">
-                        {{ getTypeName(OrderForm.type) }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                    <el-form-item label="订单渠道:" prop="sale_channel_id">
-                        {{ getchannName(OrderForm.sale_channel_id) }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                    <el-form-item label="下单客户:" prop="member_id">
-                        {{ getMemberName(OrderForm.member_id) }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                    <el-form-item label="客户名称:" prop="customer_name">
-                        {{ OrderForm.customer_name }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                    <el-form-item label="客户联系方式:">
-                        {{ OrderForm.customer_phone }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                    <el-form-item label="起始时间:" prop="time" :rules="rules.start_time" v-if="OrderForm.type == 'TO_C'">
-                        {{ OrderForm.start_time + '-' + OrderForm.end_time }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                    <el-form-item label="付款方式:" prop="pay_type" :rules="rules.pay_type">
-                        {{ getPayType(OrderForm.pay_type) }}
-                    </el-form-item>
-                </el-col>
-                <!-- <el-col :span="10">
+    <div>
+        <div class="bg-in-stock" ref="printId">
+            <div class="numOrder">
+                <barcode :value="barcodeValue"></barcode>
+            </div>
+            <el-form ref="orderFormRef" :rules="rules" :model="OrderForm" label-width="140px" inline
+                :disabled="isDetail">
+                <h3>基本信息</h3>
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="订单类型:" prop="type" :rules="rules.type">
+                            {{ getTypeName(OrderForm.type) }}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="订单渠道:" prop="sale_channel_id">
+                            {{ getchannName(OrderForm.sale_channel_id) }}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="下单客户:" prop="member_id">
+                            {{ getMemberName(OrderForm.member_id) }}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="客户名称:" prop="customer_name">
+                            {{ OrderForm.customer_name }}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="客户联系方式:">
+                            {{ OrderForm.customer_phone }}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="起始时间:" prop="time" :rules="rules.start_time"
+                            v-if="OrderForm.type == 'TO_C'">
+                            {{ OrderForm.start_time + '-' + OrderForm.end_time }}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="付款方式:" prop="pay_type" :rules="rules.pay_type">
+                            {{ getPayType(OrderForm.pay_type) }}
+                        </el-form-item>
+                    </el-col>
+                    <!-- <el-col :span="10">
                     <el-form-item label="应付金额:" prop="pay_price" :rules="rules.pay_price">
                         <span>{{ "¥" + price }}</span>
                     </el-form-item>
@@ -57,32 +60,32 @@
                         {{ "¥" + OrderForm.real_price }}
                     </el-form-item>
                 </el-col>-->
-                <el-col :span="10">
-                    <el-form-item label="销售人员:" prop="marketing_id" :rules="rules.marketing_id">
-                        {{ getMarketingName(OrderForm.marketing_id) }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                    <el-form-item label="配送方式:" prop="send_type" :rules="rules.send_type">
-                        {{ getSendType(OrderForm.send_type) }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                    <el-form-item label="配送仓库:" prop="warehouse_id" :rules="rules.warehouse_id">
-                        {{ warehouseNames(OrderForm.warehouse_id) }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                    <el-form-item label="返回仓库:" prop="return_warehouse_id" :rules="rules.return_warehouse_id">
-                        {{ warehouseName(OrderForm.return_warehouse_id) }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                    <el-form-item label="配送地址:" prop="province_city_area_address">
-                        {{ OrderForm.province_city_area_address }}
-                    </el-form-item>
-                </el-col>
-                <!--  <el-col :span="10">
+                    <el-col :span="10">
+                        <el-form-item label="销售人员:" prop="marketing_id" :rules="rules.marketing_id">
+                            {{ getMarketingName(OrderForm.marketing_id) }}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="配送方式:" prop="send_type" :rules="rules.send_type">
+                            {{ getSendType(OrderForm.send_type) }}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="配送仓库:" prop="warehouse_id" :rules="rules.warehouse_id">
+                            {{ warehouseNames(OrderForm.warehouse_id) }}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="返回仓库:" prop="return_warehouse_id" :rules="rules.return_warehouse_id">
+                            {{ warehouseName(OrderForm.return_warehouse_id) }}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="配送地址:" prop="province_city_area_address">
+                            {{ OrderForm.province_city_area_address }}
+                        </el-form-item>
+                    </el-col>
+                    <!--  <el-col :span="10">
                     <el-form-item label="允许负库存:">
                         <el-radio-group v-model="OrderForm.subtract_stock" :disabled="type == 'pone'">
                             <el-radio :label="false">禁止</el-radio>
@@ -90,103 +93,103 @@
                         </el-radio-group>
                     </el-form-item>
                 </el-col> -->
-                <el-col :span="24">
-                    <div class="redClass">
-                        <el-form-item label="备注:" prop="remark">
-                            {{ OrderForm.remark }}
-                        </el-form-item>
-                    </div>
-                </el-col>
-            </el-row>
-            <div style="margin-bottom: 10px">
-                <h3>商品明细</h3>
-                <div v-if="!isDetail">
-                    <!--  <el-button class="button" size="mini" type="primary" @click="handleSelectGoods">手动选择</el-button>
+                    <el-col :span="24">
+                        <div class="redClass">
+                            <el-form-item label="备注:" prop="remark">
+                                {{ OrderForm.remark }}
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                </el-row>
+                <div style="margin-bottom: 10px">
+                    <h3>商品明细</h3>
+                    <div v-if="!isDetail">
+                        <!--  <el-button class="button" size="mini" type="primary" @click="handleSelectGoods">手动选择</el-button>
                     <el-button class="button" size="mini" type="primary" @click="handleSelectGrou">选择分组商品</el-button> -->
+                    </div>
                 </div>
-            </div>
-            <div style="display: block">
-                <el-table :data="OrderForm.product_list" border :cell-style="{ textAlign: 'center' }"
-                    @selection-change="handleSelectionChange" :header-cell-style="{ textAlign: 'center' }"
-                    style="width: 95%">
-                    <el-table-column type="selection" width="40" align="center" />
-                    <el-table-column label="图标">
-                        <template slot-scope="scope">
-                            <img :src="scope.row.goods_vo.image_small_list" alt="" width="50px">
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="仓库名称">
-                        <template slot-scope="scope">
-                            {{ warehouseName(scope.row.warehouse_id) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="库位号">
-                        <template slot-scope="scope">
-                            <el-popover placement="right" trigger="click">
-                                <div>
-                                    <p v-for="item in scope.row.area_stock_list" :key="item.id">{{
-                                        item.warehouse_area_name }}</p>
-                                </div>
-                                <span slot="reference" v-if="scope.row.area_stock_list.length !== 0">{{
-                                    scope.row.area_stock_list[0].warehouse_area_name }}</span>
-                            </el-popover>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品编号">
-                        <template slot-scope="scope">
-                            {{ scope.row.goods_vo.sn }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="商品名称">
-                        <template slot-scope="scope">
-                            {{ scope.row.goods_vo.name }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="sku">
-                        <template slot-scope="scope">
-                            <span v-if="!id"> {{ scope.row.product_vo.sku }}</span>
-                            <span v-else> {{ scope.row.product_vo.sku }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="序列号">
-                        <template slot-scope="scope">
-                            <span v-if="!id"> {{ scope.row.product_vo.sn_code }}</span>
-                            <span v-else> {{ scope.row.product_vo.sn_code }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="product_vo.spec_name" label="规格型号">
-                        <!--  <template slot-scope="scope">
+                <div style="display: block">
+                    <el-table :data="OrderForm.product_list" border :cell-style="{ textAlign: 'center' }"
+                        @selection-change="handleSelectionChange" :header-cell-style="{ textAlign: 'center' }"
+                        style="width: 95%">
+                        <el-table-column type="selection" width="40" align="center" />
+                        <el-table-column label="图标">
+                            <template slot-scope="scope">
+                                <img :src="scope.row.goods_vo.image_small_list" alt="" width="50px">
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="仓库名称">
+                            <template slot-scope="scope">
+                                {{ warehouseName(scope.row.warehouse_id) }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="库位号">
+                            <template slot-scope="scope">
+                                <el-popover placement="right" trigger="click">
+                                    <div>
+                                        <p v-for="item in scope.row.area_stock_list" :key="item.id">{{
+                                            item.warehouse_area_name }}</p>
+                                    </div>
+                                    <span slot="reference" v-if="scope.row.area_stock_list.length !== 0">{{
+                                        scope.row.area_stock_list[0].warehouse_area_name }}</span>
+                                </el-popover>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="商品编号">
+                            <template slot-scope="scope">
+                                {{ scope.row.goods_vo.sn }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="商品名称">
+                            <template slot-scope="scope">
+                                {{ scope.row.goods_vo.name }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="sku">
+                            <template slot-scope="scope">
+                                <span v-if="!id"> {{ scope.row.product_vo.sku }}</span>
+                                <span v-else> {{ scope.row.product_vo.sku }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="序列号">
+                            <template slot-scope="scope">
+                                <span v-if="!id"> {{ scope.row.product_vo.sn_code }}</span>
+                                <span v-else> {{ scope.row.product_vo.sn_code }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="product_vo.spec_name" label="规格型号">
+                            <!--  <template slot-scope="scope">
                             <span v-if="!id">{{ scope.row.product_vo.spec_name }}</span>
                             <span v-else>{{ scope.row.product_vo.spec_name }}</span>
                         </template> -->
-                    </el-table-column>
-                    <el-table-column label="单位">
-                        <template slot-scope="scope">
-                            <span v-if="!id"> {{ scope.row.product_vo.unit }}</span>
-                            <span v-else> {{ scope.row.product_vo.unit }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="订单数量">
-                        <template slot-scope="scope">
-                            {{ scope.row.num }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="库存数量">
-                        <template slot-scope="scope">
-                            {{ scope.row.usable_stock }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="售后数量">
-                        <template slot-scope="scope">
-                            {{ scope.row.return_num }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="租赁天数" v-if="OrderForm.type == 'TO_C'">
-                        <template slot-scope="scope">
-                            {{ scope.row.day_num }}
-                        </template>
-                    </el-table-column>
-                    <!-- <el-table-column label="结束时间" width="200" v-if="OrderForm.type == 'TO_C'">
+                        </el-table-column>
+                        <el-table-column label="单位">
+                            <template slot-scope="scope">
+                                <span v-if="!id"> {{ scope.row.product_vo.unit }}</span>
+                                <span v-else> {{ scope.row.product_vo.unit }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="订单数量">
+                            <template slot-scope="scope">
+                                {{ scope.row.num }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="库存数量">
+                            <template slot-scope="scope">
+                                {{ scope.row.usable_stock }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="售后数量">
+                            <template slot-scope="scope">
+                                {{ scope.row.return_num }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="租赁天数" v-if="OrderForm.type == 'TO_C'">
+                            <template slot-scope="scope">
+                                {{ scope.row.day_num }}
+                            </template>
+                        </el-table-column>
+                        <!-- <el-table-column label="结束时间" width="200" v-if="OrderForm.type == 'TO_C'">
                         <template slot-scope="scope">
                             <el-date-picker style="width: 170px;" v-model="scope.row.end_time" type="datetime"
                                 placeholder="选择日期时间" :picker-options="pickerOptionsEnd"
@@ -201,148 +204,150 @@
                             </el-button>
                         </template>
                     </el-table-column>-->
-                </el-table>
-            </div>
-            <el-row style="margin-top: 15px;margin-bottom: 20px;">
-                <el-col :span="8">
-                    <el-form-item label="应付金额:" prop="pay_price" :rules="rules.pay_price">
-                        <span>{{ "¥" + price }}</span>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label="实付金额:" prop="real_price" :rules="rules.pay_price">
-                        {{ OrderForm.real_price }}
-                        <!-- <el-input v-model="OrderForm.real_price" placeholder="请输入"
+                    </el-table>
+                </div>
+                <el-row style="margin-top: 15px;margin-bottom: 20px;">
+                    <el-col :span="8">
+                        <el-form-item label="应付金额:" prop="pay_price" :rules="rules.pay_price">
+                            <span>{{ "¥" + price }}</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="实付金额:" prop="real_price" :rules="rules.pay_price">
+                            {{ OrderForm.real_price }}
+                            <!-- <el-input v-model="OrderForm.real_price" placeholder="请输入"
                             :disabled="type == 'pone'"></el-input>  style="display: flex;justify-content: center;" -->
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8" v-if="OrderForm.type == 'TO_C' && id">
+                        <el-form-item label="总金额:" prop="real_price" :rules="rules.pay_price">
+                            {{ '¥' + totalAmount }}
+                            <!-- <el-input v-model="OrderForm.real_price" placeholder="请输入" :disabled="type == 'pone'"></el-input> -->
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="16" v-if="OrderForm.type == 'TO_C' && id">
+                        <el-form-item label="交通费汇总:" prop="real_price">
+                            <span>{{ '¥' + TO_Cmoney }} </span>
+                            <el-button @click="reimList">查看明细</el-button>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="抬头:" :rules="rules.pay_price" v-if="OrderForm.merchant_pay_info.invoice">
+                            {{ OrderForm.merchant_pay_info.invoice }}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="税号:" :rules="rules.pay_price">
+                            {{ OrderForm.merchant_pay_info.duty_paragraph }}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="开户行:" :rules="rules.pay_price">
+                            {{ OrderForm.merchant_pay_info.bank }}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="账号:" :rules="rules.pay_price">
+                            {{ OrderForm.merchant_pay_info.bank_no }}
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="扫码支付(支付宝):" :rules="rules.pay_price">
+                            <div id="qrCode" ref="qrCodeDiv"></div>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+            </el-form>
+            <el-dialog title="添加客户信息" :visible.sync="customer.dialogVisible" width="1100px" @open="handleDialogOpen"
+                :modal-append-to-body="false" :close-on-click-modal="false" :close-on-press-escape="false">
+                <el-form :model="customer.supplierForm" :rules="customer.supplierRules" ref="supplierForm"
+                    label-width="120px" inline>
+                    <el-form-item label="公司名称" prop="name">
+                        <el-input v-model="customer.supplierForm.name" :minlength="2" :maxlength="20" clearable
+                            placeholder="请输入公司名称"></el-input>
                     </el-form-item>
-                </el-col>
-                <el-col :span="8" v-if="OrderForm.type == 'TO_C' && id">
-                    <el-form-item label="总金额:" prop="real_price" :rules="rules.pay_price">
-                        {{ '¥' + totalAmount }}
-                        <!-- <el-input v-model="OrderForm.real_price" placeholder="请输入" :disabled="type == 'pone'"></el-input> -->
+                    <el-form-item label="客户联系人" prop="contact ">
+                        <el-input v-model="customer.supplierForm.contact" :minlength="2" :maxlength="20" clearable
+                            placeholder="请输入客户联系人"></el-input>
                     </el-form-item>
-                </el-col>
-                <el-col :span="16" v-if="OrderForm.type == 'TO_C' && id">
-                    <el-form-item label="交通费汇总:" prop="real_price">
-                        <span>{{ '¥' + TO_Cmoney }} </span>
-                        <el-button @click="reimList">查看明细</el-button>
+                    <el-form-item label="性别" prop="gender">
+                        <el-radio v-model="customer.supplierForm.gender" label="男">男</el-radio>
+                        <el-radio v-model="customer.supplierForm.gender" label="女">女</el-radio>
                     </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="抬头:" :rules="rules.pay_price">
-                        {{ OrderForm.merchant_pay_info.invoice }}
+                    <el-form-item label="手机号码" prop="mobile">
+                        <el-input v-model="customer.supplierForm.mobile" :minlength="2" :maxlength="20" clearable
+                            placeholder="请输入手机号码"></el-input>
                     </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="税号:" :rules="rules.pay_price">
-                        {{ OrderForm.merchant_pay_info.duty_paragraph }}
+                    <el-form-item label="邮件" prop="email">
+                        <el-input v-model="customer.supplierForm.email" :minlength="2" :maxlength="20" clearable
+                            placeholder="请输入电子邮件"></el-input>
                     </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="开户行:" :rules="rules.pay_price">
-                        {{ OrderForm.merchant_pay_info.bank }}
+                    <el-form-item label="客户类别" prop="type">
+                        <el-select v-model="customer.supplierForm.type" placeholder="请选择客户类别">
+                            <el-option v-for="item in customer.options" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
                     </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="账号:" :rules="rules.pay_price">
-                        {{ OrderForm.merchant_pay_info.bank_no }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="扫码支付(支付宝):" :rules="rules.pay_price">
-                        <div id="qrCode" ref="qrCodeDiv"></div>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <div class="footer">
-                <!--   <el-button type="primary" @click="submit" v-if="!isDetail && type == 'pone'"
-                    :loading="formLoading">确认</el-button>
-                <el-button type="primary" @click="submitOrderForm" v-if="!isDetail && type !== 'pone'"
-                    :loading="formLoading">保存</el-button>
-                <el-button type="primary" @click="saveSubmitOrderForm" v-if="!isDetail && type !== 'pone'"
-                    :loading="formLoading">确认并保存</el-button> -->
-                <el-button @click="printIng" :disabled="false">打印</el-button>
-                <el-button @click="roBack()" :disabled="false">返回</el-button>
-            </div>
-        </el-form>
-        <el-dialog title="添加客户信息" :visible.sync="customer.dialogVisible" width="1100px" @open="handleDialogOpen"
-            :modal-append-to-body="false" :close-on-click-modal="false" :close-on-press-escape="false">
-            <el-form :model="customer.supplierForm" :rules="customer.supplierRules" ref="supplierForm"
-                label-width="120px" inline>
-                <el-form-item label="公司名称" prop="name">
-                    <el-input v-model="customer.supplierForm.name" :minlength="2" :maxlength="20" clearable
-                        placeholder="请输入公司名称"></el-input>
-                </el-form-item>
-                <el-form-item label="客户联系人" prop="contact ">
-                    <el-input v-model="customer.supplierForm.contact" :minlength="2" :maxlength="20" clearable
-                        placeholder="请输入客户联系人"></el-input>
-                </el-form-item>
-                <el-form-item label="性别" prop="gender">
-                    <el-radio v-model="customer.supplierForm.gender" label="男">男</el-radio>
-                    <el-radio v-model="customer.supplierForm.gender" label="女">女</el-radio>
-                </el-form-item>
-                <el-form-item label="手机号码" prop="mobile">
-                    <el-input v-model="customer.supplierForm.mobile" :minlength="2" :maxlength="20" clearable
-                        placeholder="请输入手机号码"></el-input>
-                </el-form-item>
-                <el-form-item label="邮件" prop="email">
-                    <el-input v-model="customer.supplierForm.email" :minlength="2" :maxlength="20" clearable
-                        placeholder="请输入电子邮件"></el-input>
-                </el-form-item>
-                <el-form-item label="客户类别" prop="type">
-                    <el-select v-model="customer.supplierForm.type" placeholder="请选择客户类别">
-                        <el-option v-for="item in customer.options" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <!-- <el-form-item label="状态" prop="status">
+                    <!-- <el-form-item label="状态" prop="status">
             <el-input v-model="customer.supplierForm.status" :minlength="2" :maxlength="20" clearable
               placeholder="请输入客户状态"></el-input>
           </el-form-item> -->
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="customer.dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="submitSupplierForm">确 定</el-button>
-            </span>
-        </el-dialog>
-        <el-dialog title="商品列表" :visible.sync="goodsVisible" width="1000px" @close="closeGoosData">
-            <el-table ref="table" :data="goodsData.records" border style="width: 100%"
-                @selection-change="handleSelChange">
-                <el-table-column type="selection" width="55" />
-                <el-table-column prop="name" label="分组名称"> </el-table-column>
-                <el-table-column prop="remark" label="描述"> </el-table-column>
-            </el-table>
-            <el-pagination @size-change="handlePageSizeChange" @current-change="handlePageCurrentChange"
-                :current-page="goodsData.page" :page-sizes="[10, 20, 50, 100]" :page-size="goodsData.size"
-                layout="total, sizes, prev, pager, next, jumper" :total="goodsData.total"></el-pagination>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="closeGoosData">取 消</el-button>
-                <el-button type="primary" @click="submitGoosData()">确 定</el-button>
-            </span>
-        </el-dialog>
-        <el-dialog title="明细列表" :visible.sync="reimListVisible">
-            <el-table ref="table" :data="OrderForm.order_customer_fees" border style="width: 100%">
-                <!--  <el-table-column type="selection" width="55" /> -->
-                <el-table-column prop="money" label="金额"> </el-table-column>
-                <el-table-column prop="file_url" label="图片">
-                    <template slot-scope="scope">
-                        <img :src="scope.row.file_url" alt="" @click="showImage(scope.row.file_url)"
-                            style="width: 60px;height: 60px">
-                    </template>
-                </el-table-column>
-            </el-table>
-            <!--  <el-pagination @size-change="handlePageSizeChange" @current-change="handlePageCurrentChange"
+                </el-form>
+                <span slot="footer" class="dialog-footer">
+                    <el-button @click="customer.dialogVisible = false">取 消</el-button>
+                    <el-button type="primary" @click="submitSupplierForm">确 定</el-button>
+                </span>
+            </el-dialog>
+            <el-dialog title="商品列表" :visible.sync="goodsVisible" width="1000px" @close="closeGoosData">
+                <el-table ref="table" :data="goodsData.records" border style="width: 100%"
+                    @selection-change="handleSelChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column prop="name" label="分组名称"> </el-table-column>
+                    <el-table-column prop="remark" label="描述"> </el-table-column>
+                </el-table>
+                <el-pagination @size-change="handlePageSizeChange" @current-change="handlePageCurrentChange"
+                    :current-page="goodsData.page" :page-sizes="[10, 20, 50, 100]" :page-size="goodsData.size"
+                    layout="total, sizes, prev, pager, next, jumper" :total="goodsData.total"></el-pagination>
+                <span slot="footer" class="dialog-footer">
+                    <el-button @click="closeGoosData">取 消</el-button>
+                    <el-button type="primary" @click="submitGoosData()">确 定</el-button>
+                </span>
+            </el-dialog>
+            <el-dialog title="明细列表" :visible.sync="reimListVisible">
+                <el-table ref="table" :data="OrderForm.order_customer_fees" border style="width: 100%">
+                    <!--  <el-table-column type="selection" width="55" /> -->
+                    <el-table-column prop="money" label="金额"> </el-table-column>
+                    <el-table-column prop="file_url" label="图片">
+                        <template slot-scope="scope">
+                            <img :src="scope.row.file_url" alt="" @click="showImage(scope.row.file_url)"
+                                style="width: 60px;height: 60px">
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <!--  <el-pagination @size-change="handlePageSizeChange" @current-change="handlePageCurrentChange"
         :current-page="goodsData.page" :page-sizes="[10, 20, 50, 100]" :page-size="goodsData.size"
         layout="total, sizes, prev, pager, next, jumper" :total="goodsData.total"></el-pagination> -->
-            <!--  <span slot="footer" class="dialog-footer">
+                <!--  <span slot="footer" class="dialog-footer">
         <el-button @click="closeGoosData">取 消</el-button>
         <el-button type="primary" @click="submitGoosData()">确 定</el-button>
       </span> -->
-        </el-dialog>
-        <el-dialog :visible.sync="imgDialogVisible" width="60%">
-            <img :src="currentImage" alt="" style="width: 100%">
-        </el-dialog>
+            </el-dialog>
+            <el-dialog :visible.sync="imgDialogVisible" width="60%">
+                <img :src="currentImage" alt="" style="width: 100%">
+            </el-dialog>
+        </div>
+        <div class="footer">
+            <!--   <el-button type="primary" @click="submit" v-if="!isDetail && type == 'pone'"
+                    :loading="formLoading">确认</el-button>
+                <el-button type="primary" @click="submitOrderForm" v-if="!isDetail && type !== 'pone'"
+                    :loading="formLoading">保存</el-button>
+                <el-button type="primary" @click="saveSubmitOrderForm" v-if="!isDetail && type !== 'pone'"
+                    :loading="formLoading">确认并保存</el-button> -->
+            <el-button @click="printIng" :disabled="false">打印</el-button>
+            <el-button @click="roBack()" :disabled="false">返回</el-button>
+        </div>
     </div>
 </template>
 
@@ -378,7 +383,13 @@ const initOrderForm = {
     subtract_stock: false,
     payment_status: "NOT_PAY",
     start_time: null,
-    real_price: 0
+    real_price: 0,
+    merchant_pay_info: {
+        invoice: '',
+        duty_paragraph: '',
+        bank: '',
+        bank_no: ''
+    }
 };
 
 export default {
@@ -420,6 +431,12 @@ export default {
                 start_time: null,
                 customer_name: "",
                 customer_phone: '',
+                merchant_pay_info: {
+                    invoice: '',
+                    duty_paragraph: '',
+                    bank: '',
+                    bank_no: ''
+                }
             },
             formLoading: false,
             isDetail: undefined,
@@ -689,20 +706,17 @@ export default {
                     colorLight: "#ffffff", //二维码背景色
                     correctLevel: QRCode.CorrectLevel.L//容错率,L/M/H
                 })
-                // 等待二维码生成完成
+                /* // 等待二维码生成完成
                 setTimeout(() => {
                     // 获取生成的二维码 canvas
                     const qrCodeCanvas = this.$refs.qrCodeDiv.querySelector('canvas');
-
                     // 创建一个新的 canvas 用于叠加 logo
                     const canvas = document.createElement('canvas');
                     const ctx = canvas.getContext('2d');
                     canvas.width = qrCodeCanvas.width;
                     canvas.height = qrCodeCanvas.height;
-
                     // 绘制二维码到新的 canvas
                     ctx.drawImage(qrCodeCanvas, 0, 0);
-
                     // 加载 logo 图片
                     const logo = new Image();
                     logo.src = this.logoUrl;
@@ -711,12 +725,11 @@ export default {
                         const x = (canvas.width - logoSize) / 2;
                         const y = (canvas.height - logoSize) / 2;
                         ctx.drawImage(logo, x, y, logoSize, logoSize);
-
                         // 将生成的二维码添加到 DOM
                         this.$refs.qrCodeDiv.innerHTML = '';
                         this.$refs.qrCodeDiv.appendChild(canvas);
                     };
-                }, 100); // 等待二维码生成完成
+                }, 100); // 等待二维码生成完成 */
             }, 500);
         },
         cleanUrl(url) {
@@ -842,26 +855,29 @@ export default {
             const scrollLeft =
                 document.documentElement.scrollLeft || document.body.scrollLeft; // 获取水平滚动轴的长度
 
-            html2canvas(printContent, {
-                canvas,
-                backgroundColor: null,
-                useCORS: true,
-                windowHeight: document.body.scrollHeight,
-                scrollX: -scrollLeft, // 解决水平偏移问题,防止打印的内容不全
-                scrollY: -scrollTop,
-            })
-                .then((canvas) => {
-                    const url = canvas.toDataURL("image/png");
-                    printJS({
-                        printable: url,
-                        type: "image",
-                        documentTitle: "", // 标题
-                        style: "@page{size:auto;margin: 0cm 1cm 0cm 1cm;}", // 去除页眉页脚
-                    });
+            // 确保二维码生成完成后再进行打印
+            this.$nextTick(() => {
+                html2canvas(printContent, {
+                    canvas,
+                    backgroundColor: null,
+                    useCORS: true,
+                    windowHeight: document.body.scrollHeight,
+                    scrollX: -scrollLeft, // 解决水平偏移问题,防止打印的内容不全
+                    scrollY: -scrollTop
                 })
-                .catch((err) => {
-                    console.error(err);
-                });
+                    .then((canvas) => {
+                        const url = canvas.toDataURL("image/png");
+                        printJS({
+                            printable: url,
+                            type: "image",
+                            documentTitle: "", // 标题
+                            style: "@page{size:auto;margin: 0cm 1cm 0cm 1cm;}", // 去除页眉页脚
+                        });
+                    })
+                    .catch((err) => {
+                        console.error(err);
+                    });
+            });
         },
         //获取仓库名称
         warehouseName(val) {

部分文件因为文件数量过多而无法显示