yangg hai 1 ano
pai
achega
0770e317c4
Modificáronse 100 ficheiros con 482 adicións e 142 borrados
  1. 1 1
      manager-admin/dist/index.html
  2. 0 0
      manager-admin/dist/static/js/0.bc03efa9f42a294df84d.js
  3. BIN=BIN
      manager-admin/dist/static/js/0.bc03efa9f42a294df84d.js.gz
  4. 0 0
      manager-admin/dist/static/js/0.f8aae46b02b0eb31a0c9.js
  5. BIN=BIN
      manager-admin/dist/static/js/0.f8aae46b02b0eb31a0c9.js.gz
  6. 0 0
      manager-admin/dist/static/js/1.7a9ceea5bc71c32d8601.js
  7. BIN=BIN
      manager-admin/dist/static/js/1.7a9ceea5bc71c32d8601.js.gz
  8. 0 0
      manager-admin/dist/static/js/1.ee1a06840ee7d27a3c11.js
  9. BIN=BIN
      manager-admin/dist/static/js/1.ee1a06840ee7d27a3c11.js.gz
  10. 0 0
      manager-admin/dist/static/js/11.051ba0d93966f5ccc985.js
  11. BIN=BIN
      manager-admin/dist/static/js/11.051ba0d93966f5ccc985.js.gz
  12. 0 0
      manager-admin/dist/static/js/11.13e4a745f3173683a9bb.js
  13. BIN=BIN
      manager-admin/dist/static/js/11.13e4a745f3173683a9bb.js.gz
  14. BIN=BIN
      manager-admin/dist/static/js/12.c8ec40700dd2994519f4.js.gz
  15. 0 0
      manager-admin/dist/static/js/12.feb99092b166a6ce3a0e.js
  16. BIN=BIN
      manager-admin/dist/static/js/12.feb99092b166a6ce3a0e.js.gz
  17. BIN=BIN
      manager-admin/dist/static/js/13.12570ae23d4b7bb1ecb7.js.gz
  18. 0 0
      manager-admin/dist/static/js/13.b76e8d4ff974d3d27927.js
  19. BIN=BIN
      manager-admin/dist/static/js/13.b76e8d4ff974d3d27927.js.gz
  20. BIN=BIN
      manager-admin/dist/static/js/14.03503a6f74150d0a0245.js.gz
  21. 0 0
      manager-admin/dist/static/js/14.1dcf156a279a106edf88.js
  22. BIN=BIN
      manager-admin/dist/static/js/14.1dcf156a279a106edf88.js.gz
  23. 0 0
      manager-admin/dist/static/js/18.700e6806a8830151d403.js
  24. 0 0
      manager-admin/dist/static/js/18.e9ab2a319dec17538e47.js
  25. 0 0
      manager-admin/dist/static/js/2.0fe9015d54d0cccb7330.js
  26. BIN=BIN
      manager-admin/dist/static/js/2.0fe9015d54d0cccb7330.js.gz
  27. 0 0
      manager-admin/dist/static/js/2.6329b114d2b50ad84f6e.js
  28. BIN=BIN
      manager-admin/dist/static/js/2.6329b114d2b50ad84f6e.js.gz
  29. 0 0
      manager-admin/dist/static/js/23.9078cabd76ea207a72ac.js
  30. 0 0
      manager-admin/dist/static/js/23.f3115198cc74914815ab.js
  31. 0 0
      manager-admin/dist/static/js/3.1650963c070a221cba0d.js
  32. 0 0
      manager-admin/dist/static/js/3.ea7db84aa301d2502bd7.js
  33. BIN=BIN
      manager-admin/dist/static/js/3.ea7db84aa301d2502bd7.js.gz
  34. BIN=BIN
      manager-admin/dist/static/js/32.d21b96c265158460e47d.js.gz
  35. 0 0
      manager-admin/dist/static/js/32.ddfab000ffbff8904c87.js
  36. BIN=BIN
      manager-admin/dist/static/js/32.ddfab000ffbff8904c87.js.gz
  37. BIN=BIN
      manager-admin/dist/static/js/33.3ca91b7ca4b260a5417d.js.gz
  38. 0 0
      manager-admin/dist/static/js/33.aba4edf7aa7b3a5d99d2.js
  39. BIN=BIN
      manager-admin/dist/static/js/33.aba4edf7aa7b3a5d99d2.js.gz
  40. 0 0
      manager-admin/dist/static/js/34.12d29c5073f24df753f8.js
  41. BIN=BIN
      manager-admin/dist/static/js/34.12d29c5073f24df753f8.js.gz
  42. 0 0
      manager-admin/dist/static/js/35.a458db33ab564d6c1052.js
  43. BIN=BIN
      manager-admin/dist/static/js/35.a458db33ab564d6c1052.js.gz
  44. 0 0
      manager-admin/dist/static/js/35.d49b9c4eec93db9a01eb.js
  45. 0 0
      manager-admin/dist/static/js/47.0006aba33e06c8e51c65.js
  46. BIN=BIN
      manager-admin/dist/static/js/47.0006aba33e06c8e51c65.js.gz
  47. 0 0
      manager-admin/dist/static/js/48.5d73749a34d07f75e4f2.js
  48. BIN=BIN
      manager-admin/dist/static/js/48.5d73749a34d07f75e4f2.js.gz
  49. 0 0
      manager-admin/dist/static/js/48.cde1488453c3ab3d73f1.js
  50. 1 0
      manager-admin/dist/static/js/49.123ba9fbcdf6f4e3d03a.js
  51. 0 0
      manager-admin/dist/static/js/50.06a79d72e770bdbe41ec.js
  52. 0 0
      manager-admin/dist/static/js/51.e2798cd0804ef45dee95.js
  53. BIN=BIN
      manager-admin/dist/static/js/51.eb5762a99fe90a6bd326.js.gz
  54. 0 0
      manager-admin/dist/static/js/52.04e3383be5e44652f93c.js
  55. BIN=BIN
      manager-admin/dist/static/js/52.04e3383be5e44652f93c.js.gz
  56. 0 0
      manager-admin/dist/static/js/53.c79fc52aa243c02bfbec.js
  57. BIN=BIN
      manager-admin/dist/static/js/54.149624af2f47da4a4ea0.js.gz
  58. 0 0
      manager-admin/dist/static/js/54.397804191545c41790c5.js
  59. 0 0
      manager-admin/dist/static/js/55.0a642bc667711a4f3e91.js
  60. BIN=BIN
      manager-admin/dist/static/js/55.0a642bc667711a4f3e91.js.gz
  61. 0 0
      manager-admin/dist/static/js/56.2230c8b23dc0557b7628.js
  62. 0 1
      manager-admin/dist/static/js/57.70a039308c93176319c1.js
  63. 0 0
      manager-admin/dist/static/js/57.ff9e4ea893375713f546.js
  64. BIN=BIN
      manager-admin/dist/static/js/58.5383c0102930721699da.js.gz
  65. 0 0
      manager-admin/dist/static/js/58.e3583f43482200569205.js
  66. 0 0
      manager-admin/dist/static/js/59.14aac1c02f9156c377c7.js
  67. BIN=BIN
      manager-admin/dist/static/js/59.14aac1c02f9156c377c7.js.gz
  68. 0 0
      manager-admin/dist/static/js/59.22174f1cfa4e3395d5eb.js
  69. BIN=BIN
      manager-admin/dist/static/js/59.22174f1cfa4e3395d5eb.js.gz
  70. 0 0
      manager-admin/dist/static/js/6.194756e6e32b374fef75.js
  71. BIN=BIN
      manager-admin/dist/static/js/6.194756e6e32b374fef75.js.gz
  72. 0 0
      manager-admin/dist/static/js/6.c45e3593e950e0e6ca8a.js
  73. BIN=BIN
      manager-admin/dist/static/js/6.c45e3593e950e0e6ca8a.js.gz
  74. 0 0
      manager-admin/dist/static/js/7.37f6905bbc108aa444f9.js
  75. BIN=BIN
      manager-admin/dist/static/js/7.37f6905bbc108aa444f9.js.gz
  76. 0 0
      manager-admin/dist/static/js/7.7445de20b52c2c80bd0f.js
  77. 0 0
      manager-admin/dist/static/js/8.b8172bc406bf5a879267.js
  78. BIN=BIN
      manager-admin/dist/static/js/8.b8172bc406bf5a879267.js.gz
  79. 0 0
      manager-admin/dist/static/js/9.4c4a58622120f62e70e3.js
  80. BIN=BIN
      manager-admin/dist/static/js/9.4c4a58622120f62e70e3.js.gz
  81. 0 0
      manager-admin/dist/static/js/9.fef2598a319236d730b1.js
  82. BIN=BIN
      manager-admin/dist/static/js/9.fef2598a319236d730b1.js.gz
  83. 0 0
      manager-admin/dist/static/js/app.37ead63edef4f9dadf51.js
  84. BIN=BIN
      manager-admin/dist/static/js/app.37ead63edef4f9dadf51.js.gz
  85. 0 0
      manager-admin/dist/static/js/manifest.5cf2f9e5405ab73e1b7b.js
  86. 0 0
      manager-admin/dist/static/js/manifest.e276c934b98a1c475217.js
  87. 26 0
      manager-admin/src/api/order.js
  88. 9 10
      manager-admin/src/components/SkuEditor/src/helper.js
  89. 18 15
      manager-admin/src/components/SkuEditor/src/main.vue
  90. 2 1
      manager-admin/src/components/payType.vue
  91. 1 0
      manager-admin/src/views/basicSetting/goods/editForm/index.vue
  92. 2 0
      manager-admin/src/views/stock/goodsExchange/addInventory.vue
  93. 2 0
      manager-admin/src/views/stock/goodsExchange/goodsExchangeAdd.vue
  94. 2 0
      manager-admin/src/views/stock/goodsInventory/goodsInventoryAdd.vue
  95. 112 10
      manager-admin/src/views/stock/order.vue
  96. 148 12
      manager-admin/src/views/stock/orderAdd.vue
  97. 30 3
      manager-admin/src/views/stock/orderCheck.vue
  98. 18 1
      manager-admin/src/views/stock/orderOutbound.vue
  99. 3 3
      manager-admin/src/views/stock/orderReturn.vue
  100. 107 85
      manager-admin/src/views/stock/orderReturnAdd.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.d458c2a7b2e24b0f5e2ff09cf75e6099.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.5cf2f9e5405ab73e1b7b.js></script><script type=text/javascript src=/static/js/vendor.e708a6b67c83ac4e9fb3.js></script><script type=text/javascript src=/static/js/app.1da494b4e72e095a1fc5.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.d458c2a7b2e24b0f5e2ff09cf75e6099.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.e276c934b98a1c475217.js></script><script type=text/javascript src=/static/js/vendor.e708a6b67c83ac4e9fb3.js></script><script type=text/javascript src=/static/js/app.37ead63edef4f9dadf51.js></script></body></html>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/0.bc03efa9f42a294df84d.js


BIN=BIN
manager-admin/dist/static/js/0.bc03efa9f42a294df84d.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/0.f8aae46b02b0eb31a0c9.js


BIN=BIN
manager-admin/dist/static/js/0.f8aae46b02b0eb31a0c9.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/1.7a9ceea5bc71c32d8601.js


BIN=BIN
manager-admin/dist/static/js/1.7a9ceea5bc71c32d8601.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/1.ee1a06840ee7d27a3c11.js


BIN=BIN
manager-admin/dist/static/js/1.ee1a06840ee7d27a3c11.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/11.051ba0d93966f5ccc985.js


BIN=BIN
manager-admin/dist/static/js/11.051ba0d93966f5ccc985.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/11.13e4a745f3173683a9bb.js


BIN=BIN
manager-admin/dist/static/js/11.13e4a745f3173683a9bb.js.gz


BIN=BIN
manager-admin/dist/static/js/12.c8ec40700dd2994519f4.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/12.feb99092b166a6ce3a0e.js


BIN=BIN
manager-admin/dist/static/js/12.feb99092b166a6ce3a0e.js.gz


BIN=BIN
manager-admin/dist/static/js/13.12570ae23d4b7bb1ecb7.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/13.b76e8d4ff974d3d27927.js


BIN=BIN
manager-admin/dist/static/js/13.b76e8d4ff974d3d27927.js.gz


BIN=BIN
manager-admin/dist/static/js/14.03503a6f74150d0a0245.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/14.1dcf156a279a106edf88.js


BIN=BIN
manager-admin/dist/static/js/14.1dcf156a279a106edf88.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/18.700e6806a8830151d403.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/18.e9ab2a319dec17538e47.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/2.0fe9015d54d0cccb7330.js


BIN=BIN
manager-admin/dist/static/js/2.0fe9015d54d0cccb7330.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/2.6329b114d2b50ad84f6e.js


BIN=BIN
manager-admin/dist/static/js/2.6329b114d2b50ad84f6e.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/23.9078cabd76ea207a72ac.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/23.f3115198cc74914815ab.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/3.1650963c070a221cba0d.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/3.ea7db84aa301d2502bd7.js


BIN=BIN
manager-admin/dist/static/js/3.ea7db84aa301d2502bd7.js.gz


BIN=BIN
manager-admin/dist/static/js/32.d21b96c265158460e47d.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/32.ddfab000ffbff8904c87.js


BIN=BIN
manager-admin/dist/static/js/32.ddfab000ffbff8904c87.js.gz


BIN=BIN
manager-admin/dist/static/js/33.3ca91b7ca4b260a5417d.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/33.aba4edf7aa7b3a5d99d2.js


BIN=BIN
manager-admin/dist/static/js/33.aba4edf7aa7b3a5d99d2.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/34.12d29c5073f24df753f8.js


BIN=BIN
manager-admin/dist/static/js/34.12d29c5073f24df753f8.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/35.a458db33ab564d6c1052.js


BIN=BIN
manager-admin/dist/static/js/35.a458db33ab564d6c1052.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/35.d49b9c4eec93db9a01eb.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/47.0006aba33e06c8e51c65.js


BIN=BIN
manager-admin/dist/static/js/47.0006aba33e06c8e51c65.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/48.5d73749a34d07f75e4f2.js


BIN=BIN
manager-admin/dist/static/js/48.5d73749a34d07f75e4f2.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/48.cde1488453c3ab3d73f1.js


+ 1 - 0
manager-admin/dist/static/js/49.123ba9fbcdf6f4e3d03a.js

@@ -0,0 +1 @@
+webpackJsonp([49],{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)}});

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/50.06a79d72e770bdbe41ec.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/51.e2798cd0804ef45dee95.js


BIN=BIN
manager-admin/dist/static/js/51.eb5762a99fe90a6bd326.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/52.04e3383be5e44652f93c.js


BIN=BIN
manager-admin/dist/static/js/52.04e3383be5e44652f93c.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/53.c79fc52aa243c02bfbec.js


BIN=BIN
manager-admin/dist/static/js/54.149624af2f47da4a4ea0.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/54.397804191545c41790c5.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/55.0a642bc667711a4f3e91.js


BIN=BIN
manager-admin/dist/static/js/55.0a642bc667711a4f3e91.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/56.2230c8b23dc0557b7628.js


+ 0 - 1
manager-admin/dist/static/js/57.70a039308c93176319c1.js

@@ -1 +0,0 @@
-webpackJsonp([57],{"/SZ4":function(n,t,e){var a=e("Hn0z");"string"==typeof a&&(a=[[n.i,a,""]]),a.locals&&(n.exports=a.locals);e("rjj0")("937810d8",a,!0)},Hn0z:function(n,t,e){(n.exports=e("FZ+f")(!1)).push([n.i,"\n.center[data-v-2163eeac] {\r\n    width: 100%;\r\n    padding: 15px;\n}\n.header_info[data-v-2163eeac] {\r\n    border-radius: 10px;\r\n    padding: 10px;\r\n    width: 100%;\r\n    background-color: #fff;\n}\np[data-v-2163eeac] {\r\n    padding-top: 5px;\r\n    padding-bottom: 5px;\n}\n.btn[data-v-2163eeac] {\r\n    width: 100%;\r\n    margin-top: 80px;\n}\r\n",""])},P95X:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=e("hky6"),r={data:function(){return{scanSource:"未知扫码来源",sn:"",price:"",payUrl:""}},methods:{goPay:function(){a.v({order_id:this.$route.query.id,pay_type:this.scanSource}).then(function(n){document.write(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()}},i=e("XyMi");var c=function(n){e("/SZ4")},s=Object(i.a)(r,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,c,"data-v-2163eeac",null);t.default=s.exports}});

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/57.ff9e4ea893375713f546.js


BIN=BIN
manager-admin/dist/static/js/58.5383c0102930721699da.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/58.e3583f43482200569205.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/59.14aac1c02f9156c377c7.js


BIN=BIN
manager-admin/dist/static/js/59.14aac1c02f9156c377c7.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/59.22174f1cfa4e3395d5eb.js


BIN=BIN
manager-admin/dist/static/js/59.22174f1cfa4e3395d5eb.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/6.194756e6e32b374fef75.js


BIN=BIN
manager-admin/dist/static/js/6.194756e6e32b374fef75.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/6.c45e3593e950e0e6ca8a.js


BIN=BIN
manager-admin/dist/static/js/6.c45e3593e950e0e6ca8a.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/7.37f6905bbc108aa444f9.js


BIN=BIN
manager-admin/dist/static/js/7.37f6905bbc108aa444f9.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/7.7445de20b52c2c80bd0f.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/8.b8172bc406bf5a879267.js


BIN=BIN
manager-admin/dist/static/js/8.b8172bc406bf5a879267.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/9.4c4a58622120f62e70e3.js


BIN=BIN
manager-admin/dist/static/js/9.4c4a58622120f62e70e3.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/9.fef2598a319236d730b1.js


BIN=BIN
manager-admin/dist/static/js/9.fef2598a319236d730b1.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/app.37ead63edef4f9dadf51.js


BIN=BIN
manager-admin/dist/static/js/app.1da494b4e72e095a1fc5.js.gz → manager-admin/dist/static/js/app.37ead63edef4f9dadf51.js.gz


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/manifest.5cf2f9e5405ab73e1b7b.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
manager-admin/dist/static/js/manifest.e276c934b98a1c475217.js


+ 26 - 0
manager-admin/src/api/order.js

@@ -313,4 +313,30 @@ export function queryLogistics(param) {
     headers: { 'Content-Type': 'application/json' },
     data:param
   })
+}
+/* /admin/erp/order/{id}/revoke */
+export function orderRevoke(id) {
+  return request({
+    url: `/admin/erp/order/${id}/revoke`,
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' },
+  })
+}
+/* 报销新加 */
+export function addOrderCustomerFee(param) {
+  return request({
+    url: `/admin/erp/order/addOrderCustomerFee`,
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' },
+    data:param
+  })
+}
+/* 报销修改 */
+export function editOrderCustomerFee(param,id) {
+  return request({
+    url: `/admin/erp/order/editOrderCustomerFee/${id}`,
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' },
+    data:param
+  })
 }

+ 9 - 10
manager-admin/src/components/SkuEditor/src/helper.js

@@ -56,7 +56,7 @@ export const defaultParams = [
     reg: RegExp.money,
     batch: true
   },
- /* {
+  {
     key: 'cost_price',
     name: '成本价',
     value: 0,
@@ -65,7 +65,7 @@ export const defaultParams = [
     reg: RegExp.money,
     batch: true
   },
-   {
+   /*{
     key: 'mkt_price',
     name: '市场价',
     value: 0,
@@ -172,19 +172,18 @@ export const mergeParams = (extendedParams, haveSpec) => {
  * @param category_id
  * @returns {*|Promise<unknown>}
  */
-export const getSpecsByCategoryId = (category_id) => {
+/* export const getSpecsByCategoryId = (category_id) => {
   return request({
     url: `/admin/goods/specs/categories/${category_id}  `,
     method: 'get',
     loading: false
   })
-}
- /*  export function getSpecsByCategoryId(params) {
+} */
+  export function getSpecsByCategoryId() {
     return request({
-      url: 'admin/goods/specs',
+      url: '/admin/goods/specs/getAllCategories',
       method: 'get',
-      loading: false,
-      params
+  
     })
   }
   export function getSpecValues(spec_id) {
@@ -192,7 +191,7 @@ export const getSpecsByCategoryId = (category_id) => {
       url: `admin/goods/specs/${spec_id}/values`,
       method: 'get'
     })
-  } */
+  }
   
 
 /**
@@ -223,7 +222,7 @@ export const makeTableForm = (selectedSpecs, params, skuList, haveSpec,hire_or_s
     if(hire_or_sail=="sail" && param.name!=='日租金'){
        return tableHead.push(param)
     }else{
-      let arr1=['sku','日租金','序列号','单位']
+      let arr1=['sku','日租金','序列号','单位','成本价']
       arr1.map(el=>{
         el==param.name? tableHead.push(param):''
       })

+ 18 - 15
manager-admin/src/components/SkuEditor/src/main.vue

@@ -45,7 +45,7 @@
               </el-form-item>
             </div>
             <div class="spec-value-item" :class="{ 'has-img': sp.has_spec_image }">
-              <el-button v-if="sp.spec_id" type="text" @click="handleAddSpecVal(sp_index)">添加规格值</el-button>
+              <el-button v-if="sp.spec_id" type="text" @click="handleAddSpecVal(sp_index, sp)">添加规格值</el-button>
               <span v-else style="color: #999; font-size: 12px">请选择规格</span>
             </div>
           </el-form-item>
@@ -276,9 +276,10 @@ export default {
         this.loading = true;
         const goodsInfo = this.goodsInfo;
         console.log('goodsInfo', this.goodsInfo);
-        if (goodsInfo.product_list) { 
-          // 获取规格列表
-          this.getSpecList(); 
+        // 获取规格列表
+        this.getSpecList();
+        if (goodsInfo.product_list) {
+
           this.skuForm.skuList = Helper.cloneJson(goodsInfo.product_list);
           this.rawSkuList = Helper.cloneJson(goodsInfo.product_list);
           // 初始化商品SKU中已选择的规格信息
@@ -294,7 +295,7 @@ export default {
     // 获取规格列表
     async getSpecList() {
       const category_id = this.goodsInfo.category_id || this.categoryId;
-      await Helper.getSpecsByCategoryId(category_id).then((res) => {//
+      await Helper.getSpecsByCategoryId().then((res) => {//category_id
         this.specList = res;
         this.makeTableForm();
       });
@@ -333,15 +334,17 @@ export default {
       } */
     },
     // 获取规格下的规格值列表
-     getSpecValueList(spec_id) {
-     /*  try {
-        return await Helper.getSpecValues(spec_id); // 假设返回 { values: [ 数组内容 ] }
-      } catch (error) {
-        console.error("Error fetching spec values:", error);
-        throw error;
-      } */
-       const specVal = this.specList.find((item) => item.spec_id === spec_id);
-       return specVal ? specVal.value_list : [];
+    getSpecValueList(spec_id) {
+      /*  return Helper.getSpecValues(spec_id).then(res => {
+         console.log(res);
+         
+         return res; // 确保这里返回的是一个数组
+       }).catch(error => {
+         console.error("Error fetching spec values:", error);
+         return []; // 发生错误时返回空数组,避免进一步的错误
+       }); */
+      const specVal = this.specList.find((item) => item.spec_id === spec_id);
+      return specVal ? specVal.value_list : [];
     },
     // 计算要禁用的规格
     computedDisabledSpec(spec_id) {
@@ -369,7 +372,7 @@ export default {
       });
     },
     // 添加规格值
-    handleAddSpecVal(index) {
+    async handleAddSpecVal(index, sv) {
       this.skuForm.selectedSpecs[index].spec_value_list.push({
         spec_value_id: "",
         spec_name: ""

+ 2 - 1
manager-admin/src/components/payType.vue

@@ -27,7 +27,8 @@ export default {
         goPay() {
             API_Setting.getPayUrl({ order_id: this.$route.query.id, pay_type: this.scanSource }).then(res => {
                /*  this.payUrl = res */
-                document.write(res)
+               window.open(res) 
+                /* document.write(res) */
               /*   const form = document.querySelector('form[name="punchout_form"]');
                 if (form) {
                     form.submit();

+ 1 - 0
manager-admin/src/views/basicSetting/goods/editForm/index.vue

@@ -115,6 +115,7 @@ export default {
         }
 
         if (this.id) {
+          console.log(formDataCopy);
           await API_Goods.editGoods(this.id, formDataCopy);
           sessionStorage.removeItem("sn");
           this.$message.success("修改成功");

+ 2 - 0
manager-admin/src/views/stock/goodsExchange/addInventory.vue

@@ -509,6 +509,7 @@ export default {
     },
     //扫序列号goodsExchangeAddForm.product_list[this.index].sn_code_list
     toSnCode() {
+      if(this.sku=='') return this.$message.error('请录入正确的sku')
       API_GoodsExchange.getSnCode("in", this.sku, this.sn_code.replace(/\s+/g, '')).then((res) => {
         this.sn_code = "";
         // 假设res是一个对象,我们根据res的某个属性(如sn)来检查重复
@@ -811,6 +812,7 @@ export default {
             this.$refs.sn_input.focus();
           });
         } else {
+          this.goodsExchangeAddForm.product_list[this.index].num = 1
           /* this.scanDialogVisible = false; */
         }
       });

+ 2 - 0
manager-admin/src/views/stock/goodsExchange/goodsExchangeAdd.vue

@@ -446,6 +446,7 @@ export default {
     },
     //扫序列号goodsExchangeAddForm.product_list[this.index].sn_code_list
     toSnCode() {
+      if(this.sku=='') return this.$message.error('请录入正确的sku')
       API_GoodsExchange.getSnCode("out", this.sku, this.sn_code.replace(/\s+/g, '')).then((res) => {
         this.sn_code = "";
         // 假设res是一个对象,我们根据res的某个属性(如sn)来检查重复
@@ -541,6 +542,7 @@ export default {
             this.$refs.sn_input.focus();
           });
         } else {
+          this.goodsExchangeAddForm.product_list[this.index].num = 1
           // this.scanDialogVisible = false;
         }
       });

+ 2 - 0
manager-admin/src/views/stock/goodsInventory/goodsInventoryAdd.vue

@@ -279,6 +279,7 @@ export default {
     },
     //扫序列号goodsInventoryAddForm.product_list[this.index].sn_code_list
     toSnCode() {
+      if(this.sku=='') return this.$message.error('请录入正确的sku')
       API_GoodsExchange.getSnCode("inventory", this.sku, this.sn_code.replace(/\s+/g, '')).then((res) => {
         this.sn_code = "";
         // 假设res是一个对象,我们根据res的某个属性(如sn)来检查重复
@@ -337,6 +338,7 @@ export default {
             this.$refs.sn_input.focus();
           });
         } else {
+          this.goodsInventoryAddForm.product_list[this.index].num = 1
           /* this.scanDialogVisible = false; */
         }
       });

+ 112 - 10
manager-admin/src/views/stock/order.vue

@@ -112,12 +112,12 @@
         <el-table-column label="客户">
           <template slot-scope="scope">{{
             memberType(scope.row.member_id)
-          }}</template>
+            }}</template>
         </el-table-column>
         <el-table-column label="下单时间">
           <template slot-scope="scope">{{
             scope.row.order_time | unixToDate
-          }}</template>
+            }}</template>
         </el-table-column>
         <el-table-column prop="warehouse_id" label="仓库名称">
           <template slot-scope="scope">
@@ -127,17 +127,17 @@
         <el-table-column prop="send_type" label="配送方式">
           <template slot-scope="scope">{{
             deliveryType(scope.row.send_type)
-          }}</template>
+            }}</template>
         </el-table-column>
         <el-table-column prop="pay_type" label="付款方式">
           <template slot-scope="scope">{{
             payType(scope.row.pay_type)
-          }}</template>
+            }}</template>
         </el-table-column>
         <el-table-column prop="status" label="实付金额">
           <template slot-scope="scope">{{
             "¥" + scope.row.pay_price
-          }}</template>
+            }}</template>
         </el-table-column>
         <el-table-column prop="status" label="订单状态">
           <template slot-scope="scope">
@@ -166,9 +166,15 @@
               @click="handleWithdraw(scope.row.id)">延期</el-button>
             <el-button size="mini" type="primary" v-if="!scope.row.has_pay_return"
               @click="payTypes(scope.row)">支付</el-button>
-            <el-button size="mini" type="danger" style="margin-top: 5px;" v-if="scope.row.status !== 'TO_BE_SEND'&& checkPermission(['order:payment'])"
-                       @click="afterSales(scope.row.id)">售后</el-button>
+            <el-button size="mini" type="primary" v-if="!scope.row.has_pay_return && scope.row.type === 'TO_C'"
+              @click="reimbursement(scope.row)">交通费</el-button>
+            <el-button size="mini" type="danger" style="margin-top: 5px;"
+              v-if="scope.row.status !== 'TO_BE_SEND' && checkPermission(['order:payment'])"
+              @click="afterSales(scope.row.id)">售后</el-button>
+            <el-button size="mini" @click="handleRevoke(scope.row)" style="margin-top: 5px;"
+              v-if="scope.row.status === 'TO_BE_COMMIT' || scope.row.status === 'TO_BE_SEND'">撤销</el-button>
           </template>
+
         </el-table-column>
       </template>
       <el-pagination slot="pagination" v-if="pageData" @size-change="handlePageSizeChange"
@@ -180,6 +186,32 @@
       <div id="qrCode" style="    display: flex;
     justify-content: center;" ref="qrCodeDiv"></div>
     </el-dialog>
+    <el-dialog title="交通费信息" :visible.sync="reimburVisible" :modal-append-to-body="false" :close-on-click-modal="false"
+      :close-on-press-escape="false">
+          <el-form :model="reimburForm" ref="reimburForm" label-width="120px" inline>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="金额:" prop="money ">
+                  <el-input v-model="reimburForm.money" :minlength="2" :maxlength="20" clearable
+                    placeholder="请输入报销金额"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="报销凭证:" prop="gender">
+                  <el-upload class="avatar-uploader" :action="MixinUploadApi"
+                    :show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <img v-if="reimburForm.file_url" :src="reimburForm.file_url" class="avatar">
+                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                  </el-upload>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+      <span slot="footer" class="dialog-footer">
+         <el-button @click="reimburVisible = false">取 消</el-button>
+        <el-button type="primary"  @click="addReimburForm">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -230,7 +262,14 @@ export default {
       //当前地址
       payurl: "",
       paySn: '',
-      pay_price: 0
+      pay_price: 0,
+      reimburVisible: false,
+      reimburForm: {
+        order_id:'',
+        money:"",
+        file_url: ''
+      },
+      
     };
   },
   mounted() {
@@ -258,11 +297,47 @@ export default {
     next();
   },
   methods: {
+    //提交报销单
+    addReimburForm(){
+      API_order.addOrderCustomerFee(this.reimburForm).then(res=>{
+        this.$message.success('添加成功')
+        this.reimburVisible = false
+        this.reimburForm={}
+      })
+    },
+    handleAvatarSuccess(res, file) {
+      this.reimburForm.file_url =file.response.url
+     // this.reimburForm.file_url = URL.createObjectURL(file.raw);
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === 'image/jpeg';
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isJPG) {
+        this.$message.error('上传头像图片只能是 JPG 格式!');
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!');
+      }
+      return isJPG && isLt2M;
+    },
+    /* 报销 */
+    reimbursement(row) {
+      this.reimburForm.order_id=row.id
+      this.reimburVisible = true
+    },
+    //撤销
+    handleRevoke(row) {
+      API_order.orderRevoke(row.id).then(res => {
+        this.$message.success('撤销成功!')
+        this.GET_OrderList();
+      })
+    },
     //新增售后
-    afterSales(row){
+    afterSales(row) {
       this.$router.push({
         name: "orderReturnAdd",
-        params: { id:row },
+        params: { id: row },
       });
     },
     closeDialog() {
@@ -730,4 +805,31 @@ section>div {
   display: flex;
   justify-content: center;
 }
+
+/deep/.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
 </style>

+ 148 - 12
manager-admin/src/views/stock/orderAdd.vue

@@ -144,7 +144,7 @@
           <el-table-column type="selection" width="40" align="center" />
           <el-table-column label="图标">
             <template slot-scope="scope">
-              <img :src="cleanUrl(scope.row.goods_vo.image_small_list)" alt="" width="50px">
+              <img :src="scope.row.goods_vo.image_small_list" alt="" width="50px">
             </template>
           </el-table-column>
           <el-table-column label="仓库名称">
@@ -287,13 +287,25 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="实付金额:" prop="real_price" :rules="rules.pay_price">
-            <!-- @input="validateNumber" 
-            <span>折扣:
-            </span>
-            <span>折后金额:</span>-->
             <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">
+            <el-button @click="reimList">报销</el-button>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <!-- <el-form-item label="交通费:" prop="real_price">
+           <el-button></el-button>
+          </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-row>
       <!-- <div class="mx">
       <h3>支付信息</h3>
@@ -406,6 +418,55 @@
         <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.file_url" alt="">
+          </template>
+           </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button size="mini" @click="editReim(scope.row)">修改</el-button>
+          </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">
+        <el-button @click="closeGoosData">取 消</el-button>
+        <el-button type="primary" @click="submitGoosData()">确 定</el-button>
+      </span> -->
+    </el-dialog>
+    <el-dialog title="交通费信息" :visible.sync="reimburVisible" :modal-append-to-body="false" :close-on-click-modal="false"
+      :close-on-press-escape="false">
+          <el-form :model="reimburForm" ref="reimburForm" label-width="120px" inline>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="金额:" prop="money ">
+                  <el-input v-model="reimburForm.money" :minlength="2" :maxlength="20" clearable
+                    placeholder="请输入报销金额"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="报销凭证:" prop="gender">
+                  <el-upload class="avatar-uploader" :action="MixinUploadApi"
+                    :show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                    <img v-if="reimburForm.file_url" :src="reimburForm.file_url" class="avatar">
+                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                  </el-upload>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+      <span slot="footer" class="dialog-footer">
+         <el-button @click="reimburVisible = false">取 消</el-button>
+        <el-button type="primary"  @click="addReimburForm">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -482,6 +543,7 @@ export default {
         start_time: null,
         customer_name: "",
         customer_phone: '',
+        marketing_id: ''
       },
       formLoading: false,
       isDetail: undefined,
@@ -494,7 +556,7 @@ export default {
       batchTaxRate: 0, // 批量设置的税率
       showTaxRate: false, // 是否显示税率设置
       rules: {
-        /* customer_name: [this.MixinRequired("请输入客户名称", "blur")], */
+        customer_name: [this.MixinRequired("请输入客户名称", "blur")],
         type: [this.MixinRequired("请选择订单类型", "change")],
         pay_type: [this.MixinRequired("请选择付款方式", "change")],
         pay_price: [this.MixinRequired("请输入付款金额", "blur")],
@@ -588,7 +650,7 @@ export default {
             },
           ],
         },
-        /* customer_phone: [
+        customer_phone: [
           this.MixinRequired("请输入手机号码!"),
           {
             validator: (rule, value, callback) => {
@@ -600,7 +662,7 @@ export default {
             },
             trigger: ["change", "blur"],
           },
-        ], */
+        ],
       },
       deptList: [],
       // 客户列表
@@ -693,7 +755,15 @@ export default {
       },//商品分页
       orderType: '',//条形码查看类型
       monthDiff: 0,
-      channList:[]//渠道列表
+      channList: [],//渠道列表
+      totalAmount:0,//总计金额
+      reimListVisible:false,
+      reimburVisible:false,
+      reimburForm: {
+        order_id:'',
+        money:"",
+        file_url: ''
+      },
     };
   },
   computed: {
@@ -712,6 +782,39 @@ export default {
     this.OrderForm.marketing_id = JSON.parse(JSON.parse(localStorage.getItem("admin_user")).data).uid
   },
   methods: {
+    //提交报销单
+    addReimburForm(){
+      API_Order.editOrderCustomerFee(this.reimburForm,this.reimburForm.id).then(res=>{
+        this.$message.success('修改成功!')
+        this.reimburVisible=false
+      })
+    },
+    handleAvatarSuccess(res, file) {
+      this.reimburForm.file_url =file.response.url
+     // this.reimburForm.file_url = URL.createObjectURL(file.raw);
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === 'image/jpeg';
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isJPG) {
+        this.$message.error('上传头像图片只能是 JPG 格式!');
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!');
+      }
+      return isJPG && isLt2M;
+    },
+    /* 修改 */
+    editReim(row){
+      this.reimburForm=row
+      this.reimburForm.file_url=''
+      this.reimburVisible=true
+    },
+    /* 交通费明细 */
+    reimList(){
+      this.reimListVisible=true
+    },
     cleanUrl(url) {
       // 检查URL是否以.png结尾
       if (url.endsWith('.png')) {
@@ -1236,7 +1339,7 @@ export default {
           .then((response) => {
             this.$message.success("修改成功!");
             API_Order.submit(id).then((res) => {
-             /*  this.$message.success("订单已确认"); */
+              /*  this.$message.success("订单已确认"); */
               this.backOrderList();
             });
           })
@@ -1251,8 +1354,8 @@ export default {
         });
         API_Order.addOrder(params)
           .then((res) => {
-           /*  this.$message.success("添加成功!"); */
-             API_Order.submit(res).then((res) => {
+            /*  this.$message.success("添加成功!"); */
+            API_Order.submit(res).then((res) => {
               this.$message.success("订单已确认");
               this.backOrderList();
             });
@@ -1333,6 +1436,12 @@ export default {
           el.good_vo = el.goods_vo
           return el
         });
+        if(response.type == "TO_C"){
+          response.order_customer_fees.map(el=>{
+         this.totalAmount+= el.money + response.real_price
+        })
+        }
+        
         this.selectedOptions = response.province_city_area.split(",");
         this.OrderForm = response;
         /* this.fileList = response.attachment
@@ -1344,6 +1453,7 @@ export default {
         if (response.type == "TO_C") {
           this.time.push(response.start_time);
           this.time.push(response.end_time);
+          
         }
         /* if (this.OrderForm.payment_time) {
           this.OrderForm.payment_time = Math.floor(
@@ -1584,4 +1694,30 @@ export default {
     width: 200px;
   }
 }
+/deep/.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
 </style>

+ 30 - 3
manager-admin/src/views/stock/orderCheck.vue

@@ -11,6 +11,11 @@
                         {{ 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) }}
@@ -204,6 +209,12 @@
                         <div id="qrCode" ref="qrCodeDiv"></div>
                     </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-row>
             <div class="footer">
                 <el-button type="primary" @click="submit" v-if="!isDetail && type == 'pone'"
@@ -283,6 +294,7 @@ import * as API_Member from "@/api/member";
 import * as API_Setting from "@/api/setting";
 import * as API_CollectingAccount from "@/api/collectingAccount";
 import * as API_productClass from "@/api/productClass.js"
+import * as API_GoodsLend from '@/api/goodsLend'
 import { RegExp } from "~/ui-utils";
 import {
     provinceAndCityData,
@@ -558,7 +570,9 @@ export default {
                 size: 10
             },//商品分页
             orderType: '',//条形码查看类型
-            payurl:"",
+            payurl: "",
+            channList: [],//渠道列表
+            totalAmount: 0
         };
     },
     computed: {
@@ -575,9 +589,13 @@ export default {
         this.GET_CollectingAccountList();
         // 获取客户列表
         this.GET_CustomerList();
-        
+
     },
     methods: {
+        getchannName(value) {
+            const type = this.channList.find(type => type.id === value);
+            return type ? type.name : '未知类型';
+        },
         // 二维码生成
         creatQrCode() {
             this.$nextTick(() => {
@@ -828,6 +846,10 @@ export default {
             API_BasicSetting.getUserByDept().then((res) => {
                 this.marketingList = res;
             });
+            //渠道
+            API_GoodsLend.channel(this.params).then(response => {
+                this.channList = response.data
+            }).catch(() => { })
         },
         /** 获取自提门店列表 */
         GET_StoreList() {
@@ -1170,13 +1192,18 @@ export default {
                     el.good_vo = el.goods_vo
                     return el
                 });
+                if (response.type == "TO_C") {
+                    response.order_customer_fees.map(el => {
+                        this.totalAmount += el.money + response.real_price
+                    })
+                }
                 this.selectedOptions = response.province_city_area.split(",");
                 this.OrderForm = response;
                 if (response.type == "TO_C") {
                     this.time.push(response.start_time);
                     this.time.push(response.end_time);
                 }
-                this.creatQrCode() 
+                this.creatQrCode()
             });
         },
     },

+ 18 - 1
manager-admin/src/views/stock/orderOutbound.vue

@@ -362,6 +362,12 @@
                 <p class="row-remark">
                   物流单号:{{ deliveryForms.create_order_success.channelOrderCode }}
                 </p>
+                <p class="row-remark">
+                  快递员名称:{{ deliveryForms.user_arrives.courierInfo.courierName }}
+                </p>
+                <p class="row-remark">
+                  快递员电话:{{ deliveryForms.user_arrives.courierInfo.courierMobile }}
+                </p>
                 <p class="row-remark">
                   {{ deliveryForms.user_sending.remark }}
                 </p>
@@ -372,7 +378,7 @@
                 </p>
               </div>
             </el-step>
-            <el-step icon="el-icon-success" v-if="JSON.stringify(deliveryForms.user_arrives) !== '{}'" :title="deliveryForms.user_arrives.orderStatus == 202 ? '已取件' : ''
+            <el-step icon="el-icon-success" v-if="JSON.stringify(deliveryForms.user_arrives) !== '{}'" :title="deliveryForms.user_arrives.orderStatus == 202 ? '已到店' : ''
               ">
               <div slot="description">
                 <p class="row-remark">
@@ -384,6 +390,12 @@
                 <p class="row-remark">
                   {{ deliveryForms.user_arrives.remark }}
                 </p>
+                <p class="row-remark">
+                  快递员名称:{{ deliveryForms.user_arrives.courierInfo.courierName }}
+                </p>
+                <p class="row-remark">
+                  快递员电话:{{ deliveryForms.user_arrives.courierInfo.courierMobile }}
+                </p>
                 <p class="row-time">
                   {{
                     (deliveryForms.user_arrives.requestTime / 1000) | unixToDate
@@ -808,6 +820,7 @@ export default {
             this.$refs.sn_input.focus();
           });
         } else {
+          this.goodsExchangeAddForm.product_list[this.index].num = 1
           this.scanDialogVisible = false;
         }
       });
@@ -821,6 +834,7 @@ export default {
     },
     //扫序列号goodsExchangeAddForm.product_list[this.index].sn_code_list
     toSnCode() {
+      if(this.sku=='') return this.$message.error('请录入正确的sku')
       API_GoodsExchange.getSnCode("out", this.sku, this.sn_code.replace(/\s+/g, '')).then((res) => {
         this.sn_code = "";
         // 假设res是一个对象,我们根据res的某个属性(如sn)来检查重复
@@ -1197,6 +1211,9 @@ export default {
         }
         res.order_item_vos.map((el) => {
           el.orderNum = el.num
+          if(res.kdn_order_code == undefined || res.kdn_order_code ==''){
+            el.num=0
+          }
           if (!el.sn_code_list) {
             el.sn_code_list = []
           }

+ 3 - 3
manager-admin/src/views/stock/orderReturn.vue

@@ -70,13 +70,13 @@
     >
       <div slot="toolbar" class="inner-toolbar">
         <div class="toolbar-btns">
-          <el-button
+         <!--  <el-button
             size="mini"
             v-if="checkPermission(['orderReturn:add'])"
             type="primary"
             @click="handleAddPurchasePlan"
             >新增</el-button
-          >
+          > -->
           <!--  <el-button size="mini" v-if="checkPermission(['orderReturn:del'])" type="danger" @click="handleDeletePurchasePlan"
             :disabled="multipleSelection.length === 0">删除</el-button> -->
         </div>
@@ -290,7 +290,7 @@ export default {
     },
     handleAuditPurchasePlan(row) {
       this.$router.push({
-        name: "orderReturnAudit",
+        name: "orderReturnDetail",
         params: { id: row.id },
       });
     },

+ 107 - 85
manager-admin/src/views/stock/orderReturnAdd.vue

@@ -2,49 +2,52 @@
   <div class="bg-in-stock">
     <el-form ref="orderReturnAddForm" :model="orderReturnAddForm" label-width="120px" inline style="width: 100%;">
       <h3>退货单</h3>
-      <el-form-item label="退货时间" prop="return_time">
-        <el-date-picker v-model="orderReturnAddForm.return_time" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期时间">
+      <el-form-item label="退货时间:" prop="return_time">
+        <el-date-picker v-if="type !== 'detail'" v-model="orderReturnAddForm.return_time" value-format="yyyy-MM-dd HH:mm:ss" type="datetime"
+          placeholder="选择日期时间">
         </el-date-picker>
+      <span v-else>{{ orderReturnAddForm.return_time }}</span>
       </el-form-item>
-      <el-form-item label="订单" style="white-space: nowrap;">
-        <el-button v-if="type !== 'detail'" class="button" size="mini" type="primary" @click="handleSelectOrderSn"
-          :disabled="type === 'audit'">选择</el-button>
+      <el-form-item label="订单:" style="white-space: nowrap;">
+        <!-- <el-button v-if="type !== 'detail' || orderReturnAddForm.sn==''" class="button" size="mini" type="primary" @click="handleSelectOrderSn"
+          :disabled="type === 'audit'">选择</el-button> -->
         <span v-if="orderReturnAddForm.sn">{{ orderReturnAddForm.sn }}</span>
       </el-form-item>
       <el-form-item></el-form-item>
-      <el-form-item label="退货说明" prop="return_remark" style="width: 900px">
-        <el-input style="width:525px" v-model="orderReturnAddForm.return_remark" type="textarea"
+      <el-form-item label="退货说明:" prop="return_remark" style="width: 900px">
+        <el-input style="width:525px" v-model="orderReturnAddForm.return_remark" v-if="type !== 'detail'" type="textarea"
           :disabled="type === 'detail' || type === 'audit'" :autosize="{ minRows: 3, maxRows: 4 }"
           placeholder="请输入退货说明"></el-input>
+          <span v-else>{{ orderReturnAddForm.return_remark }}</span>
       </el-form-item>
       <div class="mx">
         <h3>退货明细</h3>
       </div>
-      <div >
+      <div>
         <el-form-item style="width: 100%;">
           <el-table :data="orderReturnAddForm.item_list" border :cell-style="{ textAlign: 'center' }"
             :header-cell-style="{ textAlign: 'center' }" style="width: 100%; margin-top: 20px;">
-            <el-table-column label="商品编号" >
+            <el-table-column label="商品编号">
               <template slot-scope="scope">
                 {{ scope.row.goods_vo.sn }}
               </template>
             </el-table-column>
-            <el-table-column label="商品名称" >
+            <el-table-column label="商品名称">
               <template slot-scope="scope">
                 {{ scope.row.goods_vo.name }}
               </template>
             </el-table-column>
-            <el-table-column prop="product_vo.spec_name" label="规格型号" >
-             <!--  <template slot-scope="scope">
+            <el-table-column prop="product_vo.spec_name" label="规格型号">
+              <!--  <template slot-scope="scope">
                 {{ scope.row.product_vo.spec_name.join('/') }}
               </template> -->
             </el-table-column>
-            <el-table-column label="单位" >
+            <el-table-column label="单位">
               <template slot-scope="scope">
                 {{ scope.row.product_vo.unit }}
               </template>
             </el-table-column>
-            <el-table-column label="单价" >
+            <el-table-column label="单价">
               <template slot-scope="scope">
                 ¥{{ scope.row.product_vo.price }}
               </template>
@@ -52,28 +55,28 @@
             <el-table-column label="购买数量">
               <template slot-scope="scope">
                 <span v-if="!id">{{ scope.row.num }}</span>
-                <span v-else>{{scope.row.order_num}}</span>
+                <span v-else>{{ scope.row.order_num }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="退货数量" >
+            <el-table-column label="退货数量">
               <template slot-scope="scope">
-                <el-input maxlength="12" v-model="scope.row.return_num"
-                @input="passInput(scope.row)"
+                <el-input maxlength="12" v-model="scope.row.return_num" @input="passInput(scope.row)"
                   :disabled="type === 'detail' || type === 'audit'" />
               </template>
             </el-table-column>
-            <el-table-column label="操作" >
-            <template slot-scope="scope">
-              <el-button size="mini"  :disabled="type === 'detail' || type === 'audit'" type="danger" @click="orderReturnAddForm.item_list.splice(scope.$index, 1)">删除
-              </el-button>
-            </template>
-          </el-table-column>
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button size="mini" :disabled="type === 'detail' || type === 'audit'" type="danger"
+                  @click="orderReturnAddForm.item_list.splice(scope.$index, 1)">删除
+                </el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </el-form-item>
       </div>
     </el-form>
     <div class="footer">
-     <!--  <el-button v-if="type === 'audit'" type="primary" @click="auditorderReturnForm('AuditPass')">审核通过
+      <!--  <el-button v-if="type === 'audit'" type="primary" @click="auditorderReturnForm('AuditPass')">审核通过
       </el-button>
       <el-button v-if="type === 'audit'" type="danger" @click="auditorderReturnForm('AuditReject')">审核驳回
       </el-button> -->
@@ -106,13 +109,19 @@ export default {
       /** 供应商退货表单*/
       orderReturnAddForm: {
         order_id: '',
-        item_list: []
+        item_list: [],
+        return_time:'',
       },
       type: ''
     }
   },
   computed: {
-    ...mapGetters(['user'])
+    ...mapGetters(['user']),
+    timeDefault() {
+      var date = new Date();
+      var s1 = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + (date.getDate()) + " " + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
+      return s1;
+    },
   },
   mounted() {
     this.GET_DeptList()
@@ -125,35 +134,46 @@ export default {
         if (this.$route.name === 'orderReturnAudit') {
           this.type = 'audit'
         } else if (this.$route.name === 'orderReturnAdd') {
+          console.log(this.$route);
           this.orderReturnAddForm = {
             item_list: []
           }
-         /*  this.orderReturnAddForm.handle_by_id = this.user.uid */
+          /*  this.orderReturnAddForm.handle_by_id = this.user.uid */
           /* this.orderReturnAddForm.dept_id = this.user.dept_id */
           this.GET_WarehouseList({ dept_id: this.user.dept_id })
-         /*  this.$set(this.orderReturnAddForm, 'return_time', new Date().getTime()) */
+          this.GET_ReturnDetails(this.$route.params.id)
+          this.id = this.$route.params.id
+          this.orderReturnAddForm.return_time=this.timeDefault
+          /*  this.$set(this.orderReturnAddForm, 'return_time', new Date().getTime()) */
           this.type = 'add'
         } else if (this.$route.name === 'orderReturnDetail') {
           this.type = 'detail'
-        }
-        if (this.$route.params.id) {
           this.id = this.$route.params.id
           this.orderReturnAddForm.id = this.$route.params.id
           this.GET_orderReturnDetail()
         }
+        if (this.$route.params.id) {
+
+        }
       }
     }
   },
   methods: {
+    GET_ReturnDetails(id) {
+      API_orderReturn.getWarehouseOutProduct(id).then(response => {
+        this.orderReturnAddForm.sn = response.sn
+        this.orderReturnAddForm.item_list = response.item_list
+      })
+    },
     /* 校验输入数量 */
-    passInput(value){
-      if(value.num<value.return_num){
+    passInput(value) {
+      if (value.num < value.return_num) {
         this.$message({
-            message: "请重新输入退货数量",
-            type: "error",
-            showClose: true,
-          });
-      return;
+          message: "请重新输入退货数量",
+          type: "error",
+          showClose: true,
+        });
+        return;
       }
     },
     /** 获取人员列表 */
@@ -174,48 +194,48 @@ export default {
         /* orderApiParams: { ship_flag: true }, */
         limit: 1
       })
-      this.orderReturnAddForm.order_id=orders[0].id
+      this.orderReturnAddForm.order_id = orders[0].id
       if (orders) {
         API_orderReturn.getWarehouseOutProduct(orders[0].id).then(response => {
           /* const product_list =*/
-        /* response.item_list.map(el => {
-            el.allow_sn=el.goods_vo.allow_sn
-            el.bar_code=el.goods_vo.bar_code
-            el.brand_id=el.goods_vo.brand_id
-            el.brand_name=el.goods_vo.brand_name
-            el.category_id=el.goods_vo.category_id
-            el.category_ids=el.goods_vo.category_ids
-            el.category_name=el.goods_vo.category_name
-            el.cost_price=el.goods_vo.cost_price
-            el.create_time=el.goods_vo.create_time
-            el.creator=el.goods_vo.creator
-            el.description=el.goods_vo.description
-            el.en_name=el.goods_vo.en_name
-            el.freight_template_id=el.goods_vo.freight_template_id
-            el.goods_style=el.goods_vo.goods_style
-            el.goods_unit=el.goods_vo.goods_unit
-            el.goods_unit=el.goods_vo.goods_unit
-            el.have_spec=el.goods_vo.have_spec
-            el.hire_or_sail=el.goods_vo.hire_or_sail
-             el.id=el.goods_vo.id
-            el.image=el.goods_vo.image
-            el.image_list=el.goods_vo.image_list
-            el.label_names=el.goods_vo.label_names
-            el.market_enable=el.goods_vo.market_enable
-            el.mkt_price=el.goods_vo.mkt_price
-            el.name=el.goods_vo.name
-            el.params_list=el.goods_vo.params_list
-            el.price=el.goods_vo.price
-            el.sn=el.goods_vo.sn
-            el.sn_code=el.goods_vo.sn_code
-            el.sort=el.goods_vo.sort
-            el.update_time=el.goods_vo.update_time
-            el.updater=el.goods_vo.updater
-            el.usable_stock=el.goods_vo.usable_stock
-            el.video=el.goods_vo.video
-            return el
-          })*/
-          this.orderReturnAddForm.sn=response.sn
+          /* response.item_list.map(el => {
+              el.allow_sn=el.goods_vo.allow_sn
+              el.bar_code=el.goods_vo.bar_code
+              el.brand_id=el.goods_vo.brand_id
+              el.brand_name=el.goods_vo.brand_name
+              el.category_id=el.goods_vo.category_id
+              el.category_ids=el.goods_vo.category_ids
+              el.category_name=el.goods_vo.category_name
+              el.cost_price=el.goods_vo.cost_price
+              el.create_time=el.goods_vo.create_time
+              el.creator=el.goods_vo.creator
+              el.description=el.goods_vo.description
+              el.en_name=el.goods_vo.en_name
+              el.freight_template_id=el.goods_vo.freight_template_id
+              el.goods_style=el.goods_vo.goods_style
+              el.goods_unit=el.goods_vo.goods_unit
+              el.goods_unit=el.goods_vo.goods_unit
+              el.have_spec=el.goods_vo.have_spec
+              el.hire_or_sail=el.goods_vo.hire_or_sail
+               el.id=el.goods_vo.id
+              el.image=el.goods_vo.image
+              el.image_list=el.goods_vo.image_list
+              el.label_names=el.goods_vo.label_names
+              el.market_enable=el.goods_vo.market_enable
+              el.mkt_price=el.goods_vo.mkt_price
+              el.name=el.goods_vo.name
+              el.params_list=el.goods_vo.params_list
+              el.price=el.goods_vo.price
+              el.sn=el.goods_vo.sn
+              el.sn_code=el.goods_vo.sn_code
+              el.sort=el.goods_vo.sort
+              el.update_time=el.goods_vo.update_time
+              el.updater=el.goods_vo.updater
+              el.usable_stock=el.goods_vo.usable_stock
+              el.video=el.goods_vo.video
+              return el
+            })*/
+          this.orderReturnAddForm.sn = response.sn
           this.orderReturnAddForm.item_list = response.item_list
 
         })
@@ -257,13 +277,14 @@ export default {
     submitorderReturnAddForm() {
       const { id } = this.orderReturnAddForm
       const params = this.MixinClone(this.orderReturnAddForm)
-      const mapList={}
-      params.order_sn=params.sn
-      params.item_list=params.item_list.map(el=>{
-        mapList.order_item_id= el.id
-        mapList.order_num=el.num
-        mapList.product_id=el.product_id
-        mapList.return_num=el.return_num
+      const mapList = {}
+      params.order_id=this.id
+      params.order_sn = params.sn
+      params.item_list = params.item_list.map(el => {
+        mapList.order_item_id = el.id
+        mapList.order_num = el.num
+        mapList.product_id = el.product_id
+        mapList.return_num = el.return_num
         return mapList
       })
       if (id) {
@@ -403,7 +424,8 @@ export default {
 
 /deep/ .el-form-item {
   width: 100%;
-  .el-form-item__content{
+
+  .el-form-item__content {
     width: 80%;
   }
 }

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio