Browse Source

5.8修改

sakura 1 năm trước cách đây
mục cha
commit
318d479d9c
92 tập tin đã thay đổi với 335 bổ sung74 xóa
  1. BIN
      manager-admin/dist/favicon.ico
  2. 1 1
      manager-admin/dist/index.html
  3. BIN
      manager-admin/dist/static/js/0.79a4f54a49347daca402.js.gz
  4. 0 0
      manager-admin/dist/static/js/0.d999fd20fb663aa2ed69.js
  5. BIN
      manager-admin/dist/static/js/0.d999fd20fb663aa2ed69.js.gz
  6. 0 0
      manager-admin/dist/static/js/1.773679631b0e8f017f6d.js
  7. 0 0
      manager-admin/dist/static/js/1.773679631b0e8f017f6d.js.gz
  8. 0 0
      manager-admin/dist/static/js/10.5b6962dabecfcadf26c0.js
  9. BIN
      manager-admin/dist/static/js/10.5b6962dabecfcadf26c0.js.gz
  10. 0 0
      manager-admin/dist/static/js/10.98c8a654221f4716fd99.js
  11. BIN
      manager-admin/dist/static/js/10.98c8a654221f4716fd99.js.gz
  12. 0 0
      manager-admin/dist/static/js/11.2dcec49040835ba0b16c.js
  13. BIN
      manager-admin/dist/static/js/11.2dcec49040835ba0b16c.js.gz
  14. 0 0
      manager-admin/dist/static/js/11.b24692522a54e68fd8e4.js
  15. BIN
      manager-admin/dist/static/js/11.b24692522a54e68fd8e4.js.gz
  16. 0 0
      manager-admin/dist/static/js/12.2c6114d09a9743324bdb.js
  17. 0 0
      manager-admin/dist/static/js/12.2c6114d09a9743324bdb.js.gz
  18. 0 0
      manager-admin/dist/static/js/18.a1db592c0fbfcadd04d7.js
  19. 0 0
      manager-admin/dist/static/js/19.81b8385a18cb80a0ee28.js
  20. 0 0
      manager-admin/dist/static/js/19.81b8385a18cb80a0ee28.js.gz
  21. BIN
      manager-admin/dist/static/js/21.13947945584d15996659.js.gz
  22. 0 0
      manager-admin/dist/static/js/21.f5c0e3e21a43cabec0a5.js
  23. BIN
      manager-admin/dist/static/js/21.f5c0e3e21a43cabec0a5.js.gz
  24. 0 0
      manager-admin/dist/static/js/22.2b43c167b3b8612edc25.js
  25. BIN
      manager-admin/dist/static/js/22.2b43c167b3b8612edc25.js.gz
  26. 0 0
      manager-admin/dist/static/js/22.86d013cf61f4e58462b2.js
  27. BIN
      manager-admin/dist/static/js/22.86d013cf61f4e58462b2.js.gz
  28. 0 0
      manager-admin/dist/static/js/24.3171b78a75f78306f1d8.js
  29. 0 0
      manager-admin/dist/static/js/24.3171b78a75f78306f1d8.js.gz
  30. 0 0
      manager-admin/dist/static/js/26.eb6f35b5173cb56c3f1a.js
  31. 0 0
      manager-admin/dist/static/js/26.eb6f35b5173cb56c3f1a.js.gz
  32. 0 0
      manager-admin/dist/static/js/27.2fe427d79fedeec4dd20.js
  33. 0 0
      manager-admin/dist/static/js/27.2fe427d79fedeec4dd20.js.gz
  34. BIN
      manager-admin/dist/static/js/29.51684db3b885404318d8.js.gz
  35. 0 0
      manager-admin/dist/static/js/29.9859abb50fcd34745aff.js
  36. BIN
      manager-admin/dist/static/js/29.9859abb50fcd34745aff.js.gz
  37. 0 0
      manager-admin/dist/static/js/3.e0d873b548285275b7f6.js
  38. 0 0
      manager-admin/dist/static/js/3.e0d873b548285275b7f6.js.gz
  39. 0 0
      manager-admin/dist/static/js/30.8c9ac5dbd73a09a69cfc.js
  40. 0 0
      manager-admin/dist/static/js/33.c394fe2b827b498d2b9f.js
  41. 0 0
      manager-admin/dist/static/js/33.c394fe2b827b498d2b9f.js.gz
  42. 0 0
      manager-admin/dist/static/js/36.5add1eccccaafd7fada2.js
  43. 0 0
      manager-admin/dist/static/js/37.2207b195100aaa1bcb6a.js
  44. BIN
      manager-admin/dist/static/js/37.56dc3c0608153dbd3da9.js.gz
  45. 0 0
      manager-admin/dist/static/js/38.e51ad600a6ed0934e3c8.js
  46. BIN
      manager-admin/dist/static/js/38.e51ad600a6ed0934e3c8.js.gz
  47. 0 0
      manager-admin/dist/static/js/39.153c603961fb8c6505a4.js
  48. 0 0
      manager-admin/dist/static/js/4.910741769a3e24edb38f.js
  49. 0 0
      manager-admin/dist/static/js/4.910741769a3e24edb38f.js.gz
  50. 0 0
      manager-admin/dist/static/js/40.60461e997e7a7bea9931.js
  51. 0 0
      manager-admin/dist/static/js/41.0b39444f79a1a9bf9b91.js
  52. BIN
      manager-admin/dist/static/js/41.0b39444f79a1a9bf9b91.js.gz
  53. 0 0
      manager-admin/dist/static/js/41.1207ca942be21694bf5d.js
  54. BIN
      manager-admin/dist/static/js/41.1207ca942be21694bf5d.js.gz
  55. 0 0
      manager-admin/dist/static/js/43.3bae65e761ce4d074f66.js
  56. 0 0
      manager-admin/dist/static/js/45.2e6523a75ef5ed602d64.js
  57. 0 0
      manager-admin/dist/static/js/46.496f1697b9eda0f19975.js
  58. 0 0
      manager-admin/dist/static/js/47.63b9ec36ae76b8de98f1.js
  59. BIN
      manager-admin/dist/static/js/47.63b9ec36ae76b8de98f1.js.gz
  60. BIN
      manager-admin/dist/static/js/48.4d4ea820e69253805919.js.gz
  61. 0 0
      manager-admin/dist/static/js/48.5d5c4d26e6fc2885de01.js
  62. BIN
      manager-admin/dist/static/js/48.5d5c4d26e6fc2885de01.js.gz
  63. 0 0
      manager-admin/dist/static/js/49.eac69636c7bd7b3eb3a2.js
  64. BIN
      manager-admin/dist/static/js/49.eac69636c7bd7b3eb3a2.js.gz
  65. 0 0
      manager-admin/dist/static/js/5.5b499a55454ca87357b8.js
  66. 0 0
      manager-admin/dist/static/js/5.5b499a55454ca87357b8.js.gz
  67. 0 0
      manager-admin/dist/static/js/50.0e710a102d3c2cdd85b2.js
  68. 0 0
      manager-admin/dist/static/js/50.a99eb3b7d2bc441fed51.js
  69. 0 0
      manager-admin/dist/static/js/51.343047a7ec8ce97d4939.js
  70. 0 0
      manager-admin/dist/static/js/52.0efb41d6e390dd16d983.js
  71. 0 0
      manager-admin/dist/static/js/8.4d022ba6da11a672f9e3.js
  72. 0 0
      manager-admin/dist/static/js/app.1217ce649cd05b2fb27a.js
  73. BIN
      manager-admin/dist/static/js/app.1217ce649cd05b2fb27a.js.gz
  74. 0 0
      manager-admin/dist/static/js/app.ac7d1b10bf277c9cb939.js
  75. BIN
      manager-admin/dist/static/js/app.ac7d1b10bf277c9cb939.js.gz
  76. 0 0
      manager-admin/dist/static/js/manifest.a058930bb3aa4ab3f909.js
  77. 0 0
      manager-admin/dist/static/js/manifest.c5330fd21982760c1089.js
  78. 13 2
      manager-admin/src/api/goodsExchange.js
  79. 29 12
      manager-admin/src/components/SkuEditor/src/helper.js
  80. 8 3
      manager-admin/src/components/SkuEditor/src/main.vue
  81. 1 0
      manager-admin/src/lang/zh.js
  82. 16 4
      manager-admin/src/views/basicSetting/goods/editForm/BasicInfo.vue
  83. 13 8
      manager-admin/src/views/basicSetting/goods/editForm/Sku.vue
  84. 5 1
      manager-admin/src/views/basicSetting/goods/editForm/index.vue
  85. 11 2
      manager-admin/src/views/basicSetting/goods/index.vue
  86. 82 0
      manager-admin/src/views/demo.vue
  87. 112 19
      manager-admin/src/views/stock/goodsExchange/addInventory.vue
  88. 6 4
      manager-admin/src/views/stock/goodsExchange/goodsExchange.vue
  89. 11 2
      manager-admin/src/views/stock/goodsInventory/goodsInventoryAdd.vue
  90. 23 13
      manager-admin/src/views/stock/goodsLend.vue
  91. 2 1
      manager-admin/src/views/stock/orderOutbound.vue
  92. 2 2
      manager-admin/src/views/stock/warehouseOut.vue

BIN
manager-admin/dist/favicon.ico


+ 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.4496e9e98300b7fc338280eb5ec09bc7.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.a058930bb3aa4ab3f909.js></script><script type=text/javascript src=/static/js/vendor.55afeced1dbb1f4925b0.js></script><script type=text/javascript src=/static/js/app.1217ce649cd05b2fb27a.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.4496e9e98300b7fc338280eb5ec09bc7.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.c5330fd21982760c1089.js></script><script type=text/javascript src=/static/js/vendor.55afeced1dbb1f4925b0.js></script><script type=text/javascript src=/static/js/app.ac7d1b10bf277c9cb939.js></script></body></html>

BIN
manager-admin/dist/static/js/0.79a4f54a49347daca402.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/0.d999fd20fb663aa2ed69.js


BIN
manager-admin/dist/static/js/0.d999fd20fb663aa2ed69.js.gz


+ 0 - 0
manager-admin/dist/static/js/1.e009749874b32b2ed51f.js → manager-admin/dist/static/js/1.773679631b0e8f017f6d.js


+ 0 - 0
manager-admin/dist/static/js/1.e009749874b32b2ed51f.js.gz → manager-admin/dist/static/js/1.773679631b0e8f017f6d.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/10.5b6962dabecfcadf26c0.js


BIN
manager-admin/dist/static/js/10.5b6962dabecfcadf26c0.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/10.98c8a654221f4716fd99.js


BIN
manager-admin/dist/static/js/10.98c8a654221f4716fd99.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/11.2dcec49040835ba0b16c.js


BIN
manager-admin/dist/static/js/11.2dcec49040835ba0b16c.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/11.b24692522a54e68fd8e4.js


BIN
manager-admin/dist/static/js/11.b24692522a54e68fd8e4.js.gz


+ 0 - 0
manager-admin/dist/static/js/12.3e0e1a8a763e2808e1f6.js → manager-admin/dist/static/js/12.2c6114d09a9743324bdb.js


+ 0 - 0
manager-admin/dist/static/js/12.3e0e1a8a763e2808e1f6.js.gz → manager-admin/dist/static/js/12.2c6114d09a9743324bdb.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/18.a1db592c0fbfcadd04d7.js


+ 0 - 0
manager-admin/dist/static/js/19.a34cbeab95bc78a133dd.js → manager-admin/dist/static/js/19.81b8385a18cb80a0ee28.js


+ 0 - 0
manager-admin/dist/static/js/19.a34cbeab95bc78a133dd.js.gz → manager-admin/dist/static/js/19.81b8385a18cb80a0ee28.js.gz


BIN
manager-admin/dist/static/js/21.13947945584d15996659.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/21.f5c0e3e21a43cabec0a5.js


BIN
manager-admin/dist/static/js/21.f5c0e3e21a43cabec0a5.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/22.2b43c167b3b8612edc25.js


BIN
manager-admin/dist/static/js/22.2b43c167b3b8612edc25.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/22.86d013cf61f4e58462b2.js


BIN
manager-admin/dist/static/js/22.86d013cf61f4e58462b2.js.gz


+ 0 - 0
manager-admin/dist/static/js/24.528884befb4b1e527b38.js → manager-admin/dist/static/js/24.3171b78a75f78306f1d8.js


+ 0 - 0
manager-admin/dist/static/js/24.528884befb4b1e527b38.js.gz → manager-admin/dist/static/js/24.3171b78a75f78306f1d8.js.gz


+ 0 - 0
manager-admin/dist/static/js/26.25192f19647c9ef0b555.js → manager-admin/dist/static/js/26.eb6f35b5173cb56c3f1a.js


+ 0 - 0
manager-admin/dist/static/js/26.25192f19647c9ef0b555.js.gz → manager-admin/dist/static/js/26.eb6f35b5173cb56c3f1a.js.gz


+ 0 - 0
manager-admin/dist/static/js/27.f1f99100d947247508b9.js → manager-admin/dist/static/js/27.2fe427d79fedeec4dd20.js


+ 0 - 0
manager-admin/dist/static/js/27.f1f99100d947247508b9.js.gz → manager-admin/dist/static/js/27.2fe427d79fedeec4dd20.js.gz


BIN
manager-admin/dist/static/js/29.51684db3b885404318d8.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/29.9859abb50fcd34745aff.js


BIN
manager-admin/dist/static/js/29.9859abb50fcd34745aff.js.gz


+ 0 - 0
manager-admin/dist/static/js/3.f668ee7de49d30fd1033.js → manager-admin/dist/static/js/3.e0d873b548285275b7f6.js


+ 0 - 0
manager-admin/dist/static/js/3.f668ee7de49d30fd1033.js.gz → manager-admin/dist/static/js/3.e0d873b548285275b7f6.js.gz


+ 0 - 0
manager-admin/dist/static/js/30.1312bf903026535ff589.js → manager-admin/dist/static/js/30.8c9ac5dbd73a09a69cfc.js


+ 0 - 0
manager-admin/dist/static/js/33.a0d16ccdc98b58ace692.js → manager-admin/dist/static/js/33.c394fe2b827b498d2b9f.js


+ 0 - 0
manager-admin/dist/static/js/33.a0d16ccdc98b58ace692.js.gz → manager-admin/dist/static/js/33.c394fe2b827b498d2b9f.js.gz


+ 0 - 0
manager-admin/dist/static/js/36.bfe62d0e8f6cddf1b32c.js → manager-admin/dist/static/js/36.5add1eccccaafd7fada2.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/37.2207b195100aaa1bcb6a.js


BIN
manager-admin/dist/static/js/37.56dc3c0608153dbd3da9.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/38.e51ad600a6ed0934e3c8.js


BIN
manager-admin/dist/static/js/38.e51ad600a6ed0934e3c8.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/39.153c603961fb8c6505a4.js


+ 0 - 0
manager-admin/dist/static/js/4.bd331d46761fa56690e3.js → manager-admin/dist/static/js/4.910741769a3e24edb38f.js


+ 0 - 0
manager-admin/dist/static/js/4.bd331d46761fa56690e3.js.gz → manager-admin/dist/static/js/4.910741769a3e24edb38f.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/40.60461e997e7a7bea9931.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/41.0b39444f79a1a9bf9b91.js


BIN
manager-admin/dist/static/js/41.0b39444f79a1a9bf9b91.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/41.1207ca942be21694bf5d.js


BIN
manager-admin/dist/static/js/40.3ff43a03cf97a7c6e3f3.js.gz → manager-admin/dist/static/js/41.1207ca942be21694bf5d.js.gz


+ 0 - 0
manager-admin/dist/static/js/43.a4d4816d8b777d8145af.js → manager-admin/dist/static/js/43.3bae65e761ce4d074f66.js


+ 0 - 0
manager-admin/dist/static/js/45.549a9d5764673e250ae2.js → manager-admin/dist/static/js/45.2e6523a75ef5ed602d64.js


+ 0 - 0
manager-admin/dist/static/js/46.ba14fc5ff4f00f8dceda.js → manager-admin/dist/static/js/46.496f1697b9eda0f19975.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/47.63b9ec36ae76b8de98f1.js


BIN
manager-admin/dist/static/js/47.63b9ec36ae76b8de98f1.js.gz


BIN
manager-admin/dist/static/js/48.4d4ea820e69253805919.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/48.5d5c4d26e6fc2885de01.js


BIN
manager-admin/dist/static/js/47.6dc4d73ea7a019ae5826.js.gz → manager-admin/dist/static/js/48.5d5c4d26e6fc2885de01.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/49.eac69636c7bd7b3eb3a2.js


BIN
manager-admin/dist/static/js/49.eac69636c7bd7b3eb3a2.js.gz


+ 0 - 0
manager-admin/dist/static/js/5.c12bd6dd84ef4c87f2e7.js → manager-admin/dist/static/js/5.5b499a55454ca87357b8.js


+ 0 - 0
manager-admin/dist/static/js/5.c12bd6dd84ef4c87f2e7.js.gz → manager-admin/dist/static/js/5.5b499a55454ca87357b8.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/50.0e710a102d3c2cdd85b2.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/50.a99eb3b7d2bc441fed51.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/51.343047a7ec8ce97d4939.js


+ 0 - 0
manager-admin/dist/static/js/52.ec80b6e8667c3eef4a08.js → manager-admin/dist/static/js/52.0efb41d6e390dd16d983.js


+ 0 - 0
manager-admin/dist/static/js/8.ec1a01f1641b61694787.js → manager-admin/dist/static/js/8.4d022ba6da11a672f9e3.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/app.1217ce649cd05b2fb27a.js


BIN
manager-admin/dist/static/js/app.1217ce649cd05b2fb27a.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/app.ac7d1b10bf277c9cb939.js


BIN
manager-admin/dist/static/js/app.ac7d1b10bf277c9cb939.js.gz


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/manifest.a058930bb3aa4ab3f909.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
manager-admin/dist/static/js/manifest.c5330fd21982760c1089.js


+ 13 - 2
manager-admin/src/api/goodsExchange.js

@@ -217,8 +217,8 @@ export function getWarehouseOut(params) {
 
 export function getWarehouseEntry(params) {
   return request({
-    url: '/admin/erp/warehouseEntryProduct/query',
-    method: 'post',
+    url: '/admin/erp/warehouseEntry',//'/admin/erp/warehouseEntryProduct/query',
+    method: 'get',
     loaidng: false,
     params
   })
@@ -232,3 +232,14 @@ export function getInfo(params) {
     params
   })
 }
+
+//获取商品信息
+
+export function getStockByWarehouseGood(params) {
+  return request({
+    url: '/admin/erp/warehouseEntryProduct/getStockByWarehouseGood',
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' },
+    data: params
+  })
+}

+ 29 - 12
manager-admin/src/components/SkuEditor/src/helper.js

@@ -25,21 +25,21 @@ export const defaultParams = [
   {
     key: 'bar_code',
     name: '条码',
-    value: 0,
+    // value: 0,
     type: 'Number',
     required: true,
     reg: RegExp.money,
     batch: true
   },
-  // {
-  //   key: 'sn_code',
-  //   name: '序列号',
-  //   // value: 0,
-  //   type: 'string',
-  //   required: false,
-  //   reg: RegExp.money,
-  //   batch: true
-  // },
+/*   {
+    key: 'sn_code',
+    name: '序列号',
+    // value: 0,
+    type: 'string',
+    required: false,
+    reg: RegExp.money,
+    batch: true
+  }, */
   {
     key: 'price',
     name: '价格',
@@ -101,6 +101,14 @@ export const defaultParams = [
     required: true,
     batch: true
   },
+  {
+    key: 'day_price',
+    name: '日租金',
+    value: '',
+    type: 'String',
+    required: true,
+    batch: true
+  },
   // {
   //   key: 'warning_value',
   //   name: '库存',
@@ -196,10 +204,19 @@ export const cloneJson = (json) => JSON.parse(JSON.stringify(json))
  * @param haveSpec false:单规格 true:多规格
  * @returns {{data: *, columns: *}}
  */
-export const makeTableForm = (selectedSpecs, params, skuList, haveSpec) => {
+export const makeTableForm = (selectedSpecs, params, skuList, haveSpec,hire_or_sail) => {
   const tableHead = []
   // 插入参数的列
-  params.forEach(param => tableHead.push(param))
+  params.forEach(param => {
+    if(hire_or_sail=="sail"){
+        tableHead.push(param)
+    }else{
+      let arr1=['sku','日租金','条码','序列号']
+      arr1.map(el=>{
+        el==param.name? tableHead.push(param):''
+      })
+    }
+  })
   if (haveSpec && (!selectedSpecs || selectedSpecs.length === 0)) {
     return { data: [], columns: tableHead }
   }

+ 8 - 3
manager-admin/src/components/SkuEditor/src/main.vue

@@ -95,7 +95,8 @@
         </el-table-column>
         <el-table-column label="序列号" align="center" v-if="haveSn">
           <template v-slot="{ row }">
-            <el-input-number
+              <el-input
+              onKeyUp="value=value.replace(/[\W]/g,'')"
               v-model="row.sn_code"
               :controls="false"
               :max="99999999"
@@ -250,6 +251,10 @@ export default {
     haveSn: {
       type: Boolean,
       default: false
+    },
+    hireOrSail:{
+      type:String,
+      default: ""
     }
   },
   data() {
@@ -343,9 +348,9 @@ export default {
     // 生成表格表单
     makeTableForm() {
       const specs = Helper.getSelectedSpecsFormSpecList(this.skuForm.selectedSpecs, this.specList)
-      const table = Helper.makeTableForm(specs, this.params, this.skuForm.skuList, this.haveSpec)
+      const table = Helper.makeTableForm(specs, this.params, this.skuForm.skuList, this.haveSpec,this.hireOrSail)
       this.tableColumns = table.columns
-      // console.log(this.tableColumns);
+       console.log(this.tableColumns);
       this.skuForm.skuList = table.data
       //如果是单规格,不用选择规格,默认给一个sku
       if(!this.haveSpec) {

+ 1 - 0
manager-admin/src/lang/zh.js

@@ -72,6 +72,7 @@ export default {
     orderReturnEdit: '订单退货编辑',
     orderReturnAudit: '订单退货审核',
     orderReturnDetail: '订单退货详情',
+    orderOutboundAdd:'订单发货',
     orderDetail: '订单详情',
     orderOutbound: '订单出库',
     warehouseOut: '发货管理',

+ 16 - 4
manager-admin/src/views/basicSetting/goods/editForm/BasicInfo.vue

@@ -45,7 +45,7 @@
           }"
         />
       </el-form-item>
-      <el-form-item prop="brand_id" label="品牌">
+      <el-form-item prop="brand_id" label="品牌" :rules="formRules.brand_id">
         <el-select class="form-item-width" v-model="formData.brand_id" clearable>
           <el-option
             v-for="item in brandList"
@@ -55,6 +55,16 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item prop="goods_unit" label="商品单位" :rules="formRules.goods_unit">
+        <el-input
+          class="form-item-width"
+          v-model="formData.goods_unit"
+          :minlength="1"
+          :maxlength="4"
+          clearable
+          placeholder="请输入单位"
+        ></el-input>
+      </el-form-item>
       <el-form-item prop="market_enable" label="状态" :rules="formRules.market_enable">
         <el-radio-group v-model="formData.market_enable">
           <el-radio :label="true">上架</el-radio>
@@ -181,12 +191,14 @@ export default {
         allow_sn:2
       },
       formRules: {
-        name: [this.MixinRequired('请输入商品名称', 'change')],
-        sn: [this.MixinRequired('请输入商品编号', 'change')],
+        name: [this.MixinRequired('请输入商品名称', 'blur')],
+        sn: [this.MixinRequired('请输入商品编号', 'blur')],
         category_id: [this.MixinRequired('请选择商品类别', 'change')],
         image_list: [this.MixinRequired('请添加商品图片', 'change')],
         market_enable: [this.MixinRequired('请选择是否上架', 'change')],
-        allow_sn:[this.MixinRequired('请选择是否启用序列号', 'change')]
+        allow_sn:[this.MixinRequired('请选择是否启用序列号', 'change')],
+        brand_id:[this.MixinRequired('请选择品牌', 'change')],
+        goods_unit:[this.MixinRequired('请输入商品单位', 'blur')]
       },
       // 分类列表
       categoryList: [],

+ 13 - 8
manager-admin/src/views/basicSetting/goods/editForm/Sku.vue

@@ -13,10 +13,10 @@
           <el-radio :label="true">有</el-radio>
         </el-radio-group>
       </el-form-item>
-      <!-- <el-form-item label="是否为租赁商品" >
-        <el-radio-group v-model="formData.haveSn">
-          <el-radio :label="false">否</el-radio>
-          <el-radio :label="true">是</el-radio>
+    <!--   <el-form-item label="是否为租赁商品" >
+        <el-radio-group v-model="formData.hire_or_sail">
+          <el-radio label="sail">否</el-radio>
+          <el-radio label="hire">是</el-radio>
         </el-radio-group>
       </el-form-item> -->
       <el-form-item label="SKU信息" prop="product_list">
@@ -30,6 +30,7 @@
           :categoryId="category_id"
           :have-spec="formData.haveSpec"
           :have-sn="formData.haveSn"
+          :hireOrSail="hire_or_sail"
         />
       </el-form-item>
     </el-form>
@@ -49,6 +50,9 @@ export default {
     },
     category_id: {
       type: String
+    },
+    hire_or_sail:{
+      type:String
     }
   },
   data() {
@@ -56,14 +60,15 @@ export default {
       // 表单数据
       formData: {
         haveSpec:false,
-        haveSn:false
+        haveSn:false,
       },
       formRules: {
-        haveSpec: [this.MixinRequired('请选择规格类型', 'change')]
-      }
+        haveSpec: [this.MixinRequired('请选择规格类型', 'change')],
+      },
     }
   },
-  mounted() {},
+  mounted() {
+  },
   methods: {
     /** 表单校验 */
     async validateForm() {

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

@@ -14,6 +14,7 @@
           @updateActiveTab="updateActiveTab"
           :propFormData="formData"
           :category_id="formData.category_id"
+          :hire_or_sail="hire_or_sail"
         />
       </el-tab-pane>
       <el-tab-pane label="商品详情" name="description">
@@ -52,12 +53,14 @@ export default {
       activeTab: 'basicInfo', // tab激活的窗口
       formLoading: false,
       formData: {}, // 表单数据
-      id: null // 商品id
+      id: null, // 商品id
+      hire_or_sail:""
     }
   },
   methods: {
     /** 初始化 */
     init() {
+       this.hire_or_sail=this.$route.params.hire_or_sail
       const { id } = this.$route.params
       if (id) {
         this.id = id
@@ -82,6 +85,7 @@ export default {
          this.formData.sn_code= this.formData.product_list[0].sn_code
         const formDataCopy = this.MixinClone(this.formData)
         formDataCopy.spec=formDataCopy.haveSpec
+        formDataCopy.hire_or_sail=this.hire_or_sail
         console.log(formDataCopy);
 
         if (this.id) {

+ 11 - 2
manager-admin/src/views/basicSetting/goods/index.vue

@@ -87,9 +87,16 @@
                 size="mini"
                 v-if="checkPermission(['goods:add'])"
                 type="primary"
-                @click="handleAddGoods"
+                @click="handleAddGoods('sail')"
                 >新增</el-button
               >
+              <el-button
+                size="mini"
+                v-if="checkPermission(['goods:add'])"
+                type="primary"
+                @click="handleAddGoods('hire')"
+                >新增租赁</el-button
+              >
             </div>
             <div
               class="toolbar-search"
@@ -457,9 +464,11 @@ export default {
     },
 
     /** 添加商品档案 */
-    handleAddGoods() {
+    handleAddGoods(val) {
+      console.log(val);
       this.$router.push({
         name: "goodsAddForm",
+        params:{hire_or_sail: val}
       });
     },
 

+ 82 - 0
manager-admin/src/views/demo.vue

@@ -0,0 +1,82 @@
+<template>
+  <div>
+    <div @click="print">打印</div>
+    <!-- <div
+      id="delivery"
+      style="
+        margin-top: 20px;
+        font-size: 200px !important;
+        font-weight: 600;
+        color: red;
+      "
+    >
+      测试打印
+    </div> -->
+    <!--打印内容开始-->
+    <h1 id="studentPhoTable" style="
+        margin-top: 20px;
+        font-size: 300px !important;
+        font-weight: 600;
+        color: red;
+      ">测试打印</h1>
+    <!--打印内容结束-->
+  </div>
+</template>
+
+<script>
+import Print from "print-js";
+export default {
+  methods: {
+    /*  likes(){
+      console.log(223);
+      Print({
+        printable: 'delivery',
+        type: 'html',
+        targetStyles: ['*'],
+        //style: 'body, html {font-size:300px !important;color:red;}', // 确保打印时应用这个样式
+        ignoreElements: ['no-logs', 'goods-image', 'no-btn','elementToIgnore']
+      })
+    } */
+    print() {
+      var userAgent = navigator.userAgent.toLowerCase(); //取得浏览器的userAgent字符串
+      if (userAgent.indexOf("trident") > -1) {
+        alert("请使用google或者360浏览器打印");
+        return false;
+      } else if (userAgent.indexOf("msie") > -1) {
+        var onlyChoseAlert = simpleAlert({
+          content: "请使用Google或者360浏览器打印",
+          buttons: {
+            确定: function () {
+              onlyChoseAlert.close();
+            },
+          },
+        });
+        alert("请使用google或者360浏览器打印");
+        return false;
+      } else {
+        //其它浏览器使用lodop
+        var oldstr = document.body.innerHTML;
+        var headstr = "<html><head><title></title></head><body>";
+        var footstr = "</body></html>";
+        //执行隐藏打印区域不需要打印的内容
+       // document.getElementById("otherpho").style.display = "none";
+        var printData = document.getElementById("studentPhoTable").innerHTML; //获得 div 里的所有 html 数据
+        var wind = window.open(
+          "",
+          "newwin",
+          "toolbar=no,scrollbars=yes,menubar=no"
+        );
+        wind.document.body.innerHTML = headstr + printData + footstr;
+        wind.print();
+        //打印结束后,放开隐藏内容
+        document.getElementById("otherpho").style.display = "block";
+        wind.close();
+        window.document.body.innerHTML = oldstr;
+      }
+    },
+  },
+};
+</script>
+
+<style>
+</style>

+ 112 - 19
manager-admin/src/views/stock/goodsExchange/addInventory.vue

@@ -87,7 +87,7 @@
       <div style="width: 100%; display: block">
         <el-form-item style="width: 100%">
           <el-table
-            :data="goodsExchangeAddForm.contract_product_list"
+            :data="goodsExchangeAddForm.product_list"
             border
             :cell-style="{ textAlign: 'center' }"
             :header-cell-style="{ textAlign: 'center' }"
@@ -105,7 +105,7 @@
             </el-table-column>
             <el-table-column label="条码">
               <template slot-scope="scope">
-                {{ scope.row.bar_code }}
+                {{ scope.row.product_barcode }}
               </template>
             </el-table-column>
             <el-table-column label="序列号">
@@ -123,9 +123,9 @@
                 {{ scope.row.goods_unit }}
               </template>
             </el-table-column>
-            <el-table-column label="订单数量">
+           <!--  <el-table-column label="订单数量">
 
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="入库数量">
               <template slot-scope="scope">
                 <el-input
@@ -139,13 +139,13 @@
             </el-table-column>
             <el-table-column label="库存数量">
               <template slot-scope="scope">
-                {{ scope.row.already_num }}
+                {{ scope.row.usable_stock }}
               </template>
             </el-table-column>
             <el-table-column label="差异">
               <template slot-scope="scope">
                 <!-- 入库减去库存  -->
-                {{ scope.row.num - scope.row.already_num || 0 }}
+                {{ scope.row.num - scope.row.usable_stock || 0 }}
               </template>
             </el-table-column>
             <el-table-column
@@ -157,7 +157,7 @@
                   size="mini"
                   type="danger"
                   @click="
-                    goodsExchangeAddForm.contract_product_list.splice(
+                    goodsExchangeAddForm.product_list.splice(
                       scope.$index,
                       1
                     )
@@ -178,9 +178,15 @@
       <el-button
         v-if="type !== 'audit' && type !== 'detail'"
         type="primary"
-        @click="submitgoodsExchangeAddForm"
+        @click="savegoodsExchangeAddForm"
         >保存
       </el-button>
+      <el-button
+        v-if="type !== 'audit' && type !== 'detail'"
+        type="primary"
+        @click="submitgoodsExchangeAddForm"
+        >入库
+      </el-button>
       <el-button @click="printIng" v-if="type == 'audit'">打印</el-button>
       <el-button @click="$router.back()">返回</el-button>
     </div>
@@ -258,8 +264,7 @@
         <el-table-column prop="name" label="商品名称"> </el-table-column>
         <el-table-column prop="goods_style" label="规格型号"> </el-table-column>
         <el-table-column prop="goods_unit" label="单位"> </el-table-column>
-        <el-table-column prop="product_list.stock_num" label="库存数量">
-        </el-table-column>
+        <!-- <el-table-column prop="product_list.stock_num" label="库存数量"> </el-table-column> -->
       </el-table>
       <span slot="footer" class="dialog-footer">
         <el-button @click="closeGoosData">取 消</el-button>
@@ -316,7 +321,7 @@ export default {
       orderList: [],
       id: "",
       type: "",
-      /** 库单表单*/
+      /** 库单表单*/
       goodsExchangeAddForm: {
         contract_product_list: [],
         /* additionalProp1: {
@@ -491,10 +496,25 @@ export default {
     // 保存已选商品
     submitGoosData() {
       if (this.goodsList.length >= 1) {
-        console.log(this.goodsList);
-        this.goodsExchangeAddForm.product_list = this.goodsList;
-        this.goodsExchangeAddForm.contract_product_list = this.goodsList;
-        this.goodsVisible = false;
+        let ids=[]
+        const param_list={
+          warehouse_id:this.goodsExchangeAddForm.warehouse_id,
+          good_ids:ids
+        }
+        this.goodsList.forEach(el=>{
+         ids.push(el.id)
+        })
+        API_GoodsExchange.getStockByWarehouseGood(param_list).then(res=>{
+         res.map(el=>{
+          el.product_id=el.id
+          el.goods_id=el.id
+         })
+          this.goodsExchangeAddForm.product_list = res;
+          this.goodsExchangeAddForm.contract_product_list = res;
+          console.log(res);
+          this.goodsVisible = false;
+         })
+
       } else {
         this.$message.error("请选择商品信息");
       }
@@ -611,7 +631,8 @@ export default {
         this.warehouseList = response;
       });
     },
-    submitgoodsExchangeAddForm() {
+    //保存
+    savegoodsExchangeAddForm(){
       this.$refs["goodsExchangeAddForm"].validate((valid) => {
         if (valid) {
           const { id } = this.goodsExchangeAddForm;
@@ -633,6 +654,8 @@ export default {
             ).real_name;
           }
           params.change_time = Math.floor(params.change_time / 1000);
+          //类型
+          params.save_or_submit="save"
           if (!params.contract_product_list.length) {
             this.$message.error("请选择商品!");
             return;
@@ -664,6 +687,69 @@ export default {
         }
       });
     },
+    //入库
+    submitgoodsExchangeAddForm() {
+      this.$refs["goodsExchangeAddForm"].validate((valid) => {
+        if (valid) {
+          const { id } = this.goodsExchangeAddForm;
+          const params = this.MixinClone(this.goodsExchangeAddForm);
+          params.handled_by = this.deptListAll;
+          API_order.getOrderList({sn:this.goodsExchangeAddForm.sn}).then(res=>{
+              console.log(res.data);
+              params.order_id= Number(res.data[0].id)
+            })
+          params.staff_name = this.goodsExchangeAddForm.distribution_name;
+          if (params.warehouse_id) {
+            params.warehouse_name = this.warehouseList.find(
+              (ware) => ware.id === params.warehouse_id
+            ).name;
+          }
+          if (params.handled_by_id) {
+            params.handled_by = this.adminList.find(
+              (admin) => admin.id === params.handled_by_id
+            ).real_name;
+          }
+          params.change_time = Math.floor(params.change_time / 1000);
+          params.save_or_submit="submit"
+          if (!params.contract_product_list.length) {
+            this.$message.error("请选择商品!");
+            return;
+          }
+         /* */ if (this.$route.name === "editInventory") {
+          params.contract_product_list.map(el=>{
+            el.product_id=el.id
+            el.goods_id=el.id
+          })
+          params.product_list.map(el=>{
+            el.product_id=el.id
+            el.goods_id=el.id
+          })
+            API_GoodsExchange.editWarehouseEntry(id,params).then((response) => {
+              this.$message.success("修改成功!");
+              const { callback } = this.$route.params;
+              if (typeof callback === "function") callback();
+              this.$store.dispatch("delCurrentViews", {
+                view: this.$route,
+                $router: this.$router,
+              });
+              this.$router.push({ name: "goodsExchange" });
+            });
+          } else if (this.$route.name === "addInventory") {
+            // 新增入库
+            API_GoodsExchange.warehouseEntry(params).then(() => {
+              this.$message.success("添加成功!");
+              const { callback } = this.$route.params;
+              if (typeof callback === "function") callback();
+              this.$store.dispatch("delCurrentViews", {
+                view: this.$route,
+                $router: this.$router,
+              });
+              this.$router.push({ name: "goodsExchange" });
+            });
+          }
+        }
+      });
+    },
     /*  returngoodsExchangeAddForm() {
       const { id } = this.goodsExchangeAddForm;
       const params = this.MixinClone(this.goodsExchangeAddForm);
@@ -700,8 +786,11 @@ export default {
     }, */
     // 选择出库单
     async handleSelectWarehouseEntryBatch() {
+      if (!this.goodsExchangeAddForm.warehouse_id) {
+        this.$message.error('请先选择仓库!')
+        return
+      }
       API_GoodsExchange.getGoodsInfo().then((res) => {
-        // console.log(res);
         this.goodsData = res.data;
         this.goodsVisible = true;
       });
@@ -800,9 +889,13 @@ export default {
             this.goodsExchangeAddForm.change_time * 1000
           );
           this.goodsExchangeAddForm.distribution_name = response.staff_name;
-          this.goodsExchangeAddForm.contract_product_list =
-            response.contract_product_list.map((item) => {
+          this.goodsExchangeAddForm.product_list =
+            response.product_list.map((item) => {
               //change_list
+              item.name=item.goods_do.name
+              item.sn=item.goods_do.sn
+              item.sn_code=item.goods_do.sn_code
+              item.bar_code=item.goods_do.bar_code
               item.entry_price = item.amount;
               item.product_specification = item.specification;
               item.product_unit = item.unit;

+ 6 - 4
manager-admin/src/views/stock/goodsExchange/goodsExchange.vue

@@ -123,7 +123,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="warehouse_name" label="仓库名称" />
-        <el-table-column prop="goods_sn" label="商品编号" />
+
+        <el-table-column prop="order_id" label="订单编号" />
         <!--  <el-table-column v-if="activeName=='first'" prop="warehouse_name" label="出库">
            <template slot-scope="scope">{{
             scope.row.change_time | unixToDate
@@ -131,10 +132,11 @@
         </el-table-column>
         <el-table-column v-else prop="warehouse_name" label="入库">
         </el-table-column>-->
-        <el-table-column prop="goods_name" label="商品名称" />
-        <el-table-column prop="goods_category" label="商品类别" />
+       <!-- <el-table-column prop="goods_name" label="商品名称" />
+         <el-table-column prop="goods_sn" label="商品编号" />
+         <el-table-column prop="goods_category" label="商品类别" />
         <el-table-column prop="goods_sn" label="规格型号" />
-        <el-table-column prop="qty" label="库存数量" />
+        <el-table-column prop="qty" label="库存数量" /> -->
         <el-table-column prop="memo" label="备注" />
         <!-- <el-table-column prop="status" label="状态">
           <template slot-scope="scope">{{ statusFilter(scope.row.status) }}</template>

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

@@ -33,7 +33,7 @@
       <el-form-item label="盘点类型" prop="type" class="change-form-item">
         <el-select v-model="goodsInventoryAddForm.type" @change="handleChangeWareHouse"
           :disabled="type === 'detail' || type === 'audit' || type==='check'">
-          <!-- <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" /> -->
+           <el-option v-for="item in typeList" :key="item.id" :label="item.label" :value="item.id" />
         </el-select>
         <!-- <el-cascader v-model="goodsInventoryAddForm.dept_id" :options="deptList"
           :disabled="type === 'detail' || type === 'audit' || type==='check'" :props="{
@@ -171,7 +171,16 @@ export default {
         dept_id: { required: true, message: '请选择所属部门', trigger: 'change' },
         creator_id: { required: true, message: '请选择制单人', trigger: 'change' }
       },
-      warehouseProduct: null
+      warehouseProduct: null,
+      typeList:[
+        {
+          label:"全部盘点",
+          id:"1"
+        },{
+          label:"部分盘点",
+          id:"2"
+        }
+      ]
     }
   },
   computed: {

+ 23 - 13
manager-admin/src/views/stock/goodsLend.vue

@@ -3,6 +3,8 @@
     <en-table-layout :tableData="tableData.data" :loading="loading" @selection-change="handleSelectionChange">
       <div slot="toolbar" class="inner-toolbar">
         <div class="toolbar-btns">
+          <el-button type="primary"  size="mini"
+              @click="ceshi">测试</el-button>
           <el-button size="mini" v-if="checkPermission(['goodsLend:add'])" type="primary"
             @click="handleAddGoodsLend">新增</el-button>
           <el-button size="mini" v-if="checkPermission(['goodsLend:del'])" @click="handleDeleteGoodsLend()" type="danger"
@@ -60,7 +62,7 @@
           <!-- <template slot-scope="scope">{{ scope.row.lend_time | unixToDate }}</template> -->
         </el-table-column>
         <el-table-column prop="code" label="库位号" />
-        <el-table-column prop="type" label="仓库类型">
+        <el-table-column prop="type" label="库位区域">
           <template slot-scope="scope">{{ statusFilter(scope.row.type) }}</template>
         </el-table-column>
         <el-table-column prop="intro" label="库位说明" />
@@ -89,11 +91,11 @@
 
     <el-dialog title="打印预览" :visible.sync="dialogVisible" width="940px" center @close='handleCancle'>
       <el-button size="mini" type="primary" @click="handlePrintGoodsLend" class="print">打印</el-button>
-      <div id="deliverySheet" style="width:900px">
+      <div id="deliverySheet" style="width:900px;">
         <div class="tips-t" v-for="(item,index) in codeList" :key="index">
           <div>
-            <div class="qrcode-pic" ref="codeItem" ></div>
-            <div style="margin-top: 10px;  font-size: 12px;">{{ item }}</div>
+            <!-- <div class="qrcode-pic" ref="codeItem" ></div> -->
+            <h1 class="qrcode-title" style="margin-top: 20px;  font-family: sans-serif; color: black;font-weight: 600;">{{ item }}</h1>
           </div>
         </div>
       </div>
@@ -110,14 +112,14 @@
             <el-select v-model="addLendForm.warehouse_id" clearable @change="selWarehouse">
               <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
-            <span style="color: red;margin-left: 20px;cursor: pointer;" v-if="!warehouseList" @click="gowareHouse">新增仓库</span>
+            <span style="color: red;margin-left: 20px;cursor: pointer;text-decoration:underline;" v-if="warehouseList.length==0" @click="gowareHouse">新增仓库</span>
           </el-form-item>
           <el-form-item label="库位号" prop="code">
             <el-input v-model="addLendForm.code" maxlength="12" placeholder="请输入库位号" style="width: 270px;">
               <template slot="prepend">{{ warehouseSn }}-</template>
             </el-input>
           </el-form-item>
-          <el-form-item label="仓库类型" prop="type">
+          <el-form-item label="库位区域" prop="type">
             <el-select v-model="addLendForm.type" clearable>
               <el-option v-for="item in typeList" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
@@ -207,6 +209,9 @@ export default {
     }
   },
   methods: {
+    ceshi(){
+      this.$router.push({name:"demo"})
+    },
     gowareHouse(){
       this.dialogVisibleForm=false
       this.$router.push({ name: 'warehouseList'})
@@ -262,8 +267,8 @@ export default {
             this.$refs.codeItem[index].innerHTML="";
               var qrcode = new QRCode(this.$refs.codeItem[index], {
                 text: item, //二维码内容
-                width: 100,
-                height: 100,
+                width: 600,
+                height: 660,
                 render: 'table',
                 colorDark: "#333333", //二维码颜色
                 colorLight: "#ffffff", //二维码背景色
@@ -301,7 +306,7 @@ export default {
     },
     handleConfirmGoodsLend() {
       if (!this.multipleSelection || !this.multipleSelection.length) return this.$message.error('请先选择!')
-        const ids = this.multipleSelection.map(item => item.id)
+        const ids = this.multipleSelection.map(item => item.code)
         this.codeList=ids
         this.dialogVisible = true
         this.creatQrCode()
@@ -323,7 +328,8 @@ export default {
         printable: 'deliverySheet',
         type: 'html',
         targetStyles: ['*'],
-        ignoreElements: ['no-logs', 'goods-image', 'no-btn']
+        //style: 'body, html {font-size:300px !important;color:red;}', // 确保打印时应用这个样式
+        ignoreElements: ['no-logs', 'goods-image', 'no-btn','elementToIgnore']
       })
     },
     handleDeleteGoodsLend() {
@@ -362,7 +368,7 @@ export default {
     handlePrintGoodsLendDialog(row) {
       // this.GET_GoodsLendDetail(row.id)
       this.dialogVisible = true
-      this.codeList.push(row.id)
+      this.codeList.push(row.code)
         this.creatQrCode()
     },
     /** 获取调整单详情页面数据 */
@@ -458,6 +464,10 @@ export default {
     display: flex;
   }
 }
-
-
+/* @media print {
+  html, body {
+    font-size: 60pt !important;
+    color: red;
+  }
+} */
 </style>

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

@@ -265,7 +265,7 @@
         <el-button
           type="primary"
           @click="saveErpWarehouseOut"
-          v-if="$route.name === 'orderOutboundDetail'"
+
           >发货
         </el-button>
         <el-button
@@ -332,6 +332,7 @@ export default {
       });
     },
     saveErpWarehouseOut() {
+      return
       API_order.addErpWarehouseOut({
         order_list: this.orderOutboundInfo.order_list,
         warehouse_consignee_id: this.orderOutboundInfo.warehouse_consignee_id,

+ 2 - 2
manager-admin/src/views/stock/warehouseOut.vue

@@ -135,8 +135,8 @@
           <template slot-scope="scope">
 <!--            <el-button size="mini" v-if="scope.row.allowable.audit && checkPermission(['warehouseOut:audit'])" type="success"-->
 <!--              @click="handleAuditDialog(scope.row)">审核</el-button>-->
-            <el-button size="mini" v-if="scope.row.allowable.ship && checkPermission(['warehouseOut:send'])" type="success"
-              @click="handleSendWarehouseOut(scope.row)">发货</el-button>
+           <!--  <el-button size="mini" v-if="scope.row.allowable.ship && checkPermission(['warehouseOut:send'])" type="success"
+              @click="handleSendWarehouseOut(scope.row)">发货</el-button> -->
             <!-- <el-button type="primary" v-if="checkPermission(['warehouseOut:print'])" size="mini"
               @click="handlePrintWarehouseOutDialog(scope.row)">打印</el-button> -->
           </template>

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác