Browse Source

添加库位号

yangg 1 year ago
parent
commit
38bbaf5533
99 changed files with 107 additions and 19 deletions
  1. 1 1
      manager-admin/dist/index.html
  2. 0 0
      manager-admin/dist/static/js/1.afe60e4ab7ed52df7957.js
  3. BIN
      manager-admin/dist/static/js/1.afe60e4ab7ed52df7957.js.gz
  4. 0 0
      manager-admin/dist/static/js/1.b0da4816312c42bad6f6.js
  5. BIN
      manager-admin/dist/static/js/1.b0da4816312c42bad6f6.js.gz
  6. 0 0
      manager-admin/dist/static/js/10.08522c4797a9782e3007.js
  7. BIN
      manager-admin/dist/static/js/10.08522c4797a9782e3007.js.gz
  8. 0 0
      manager-admin/dist/static/js/10.4ff235388d5dd4c4e480.js
  9. 0 0
      manager-admin/dist/static/js/2.09d540c0f3564cc0cf0d.js
  10. BIN
      manager-admin/dist/static/js/2.09d540c0f3564cc0cf0d.js.gz
  11. 0 0
      manager-admin/dist/static/js/2.d13f02a60d4601be0020.js
  12. BIN
      manager-admin/dist/static/js/2.d13f02a60d4601be0020.js.gz
  13. 0 0
      manager-admin/dist/static/js/34.fee188b5e3cb6ce69ddb.js
  14. BIN
      manager-admin/dist/static/js/34.fee188b5e3cb6ce69ddb.js.gz
  15. 0 0
      manager-admin/dist/static/js/35.d49b9c4eec93db9a01eb.js
  16. 0 0
      manager-admin/dist/static/js/36.ca50162cee1e0328ac69.js
  17. BIN
      manager-admin/dist/static/js/36.ca50162cee1e0328ac69.js.gz
  18. 0 0
      manager-admin/dist/static/js/37.0c65428158a56d9b2001.js
  19. 0 0
      manager-admin/dist/static/js/38.1e2b83046f5da18e899e.js
  20. BIN
      manager-admin/dist/static/js/38.1e2b83046f5da18e899e.js.gz
  21. 0 0
      manager-admin/dist/static/js/39.7a423f51ce2ec680aa58.js
  22. BIN
      manager-admin/dist/static/js/39.c54c60e23a7c287493f7.js.gz
  23. BIN
      manager-admin/dist/static/js/40.1f396f6928fa20157a79.js.gz
  24. 0 0
      manager-admin/dist/static/js/40.6cf5567627509b781a12.js
  25. 0 0
      manager-admin/dist/static/js/41.6fd63fb8802e535592e0.js
  26. BIN
      manager-admin/dist/static/js/41.6fd63fb8802e535592e0.js.gz
  27. 0 0
      manager-admin/dist/static/js/42.3c2b40c033cf637774d0.js
  28. BIN
      manager-admin/dist/static/js/42.3c2b40c033cf637774d0.js.gz
  29. 0 0
      manager-admin/dist/static/js/43.7cca374821c015718598.js
  30. BIN
      manager-admin/dist/static/js/43.7cca374821c015718598.js.gz
  31. BIN
      manager-admin/dist/static/js/43.a9f57db7455aead862e3.js.gz
  32. 0 0
      manager-admin/dist/static/js/44.5ef1697c4a5d9e13d1ae.js
  33. BIN
      manager-admin/dist/static/js/44.dada9c01e6a2c9fa6618.js.gz
  34. 0 0
      manager-admin/dist/static/js/45.e8efbf421d0962b57c45.js
  35. 0 0
      manager-admin/dist/static/js/46.7c91a86b6a272d79df65.js
  36. BIN
      manager-admin/dist/static/js/46.7c91a86b6a272d79df65.js.gz
  37. BIN
      manager-admin/dist/static/js/47.710a56936151b404bac1.js.gz
  38. 0 0
      manager-admin/dist/static/js/47.f13fe3c41907d9ee4091.js
  39. BIN
      manager-admin/dist/static/js/47.f13fe3c41907d9ee4091.js.gz
  40. 0 0
      manager-admin/dist/static/js/48.1911de86d11e72e6b431.js
  41. 0 0
      manager-admin/dist/static/js/48.f0402e82888e8d0c07d8.js
  42. BIN
      manager-admin/dist/static/js/48.f0402e82888e8d0c07d8.js.gz
  43. 1 1
      manager-admin/dist/static/js/49.123ba9fbcdf6f4e3d03a.js
  44. BIN
      manager-admin/dist/static/js/49.8b5c51b613b9daf5b945.js.gz
  45. 0 0
      manager-admin/dist/static/js/50.9b86716784a0d4354541.js
  46. BIN
      manager-admin/dist/static/js/50.9b86716784a0d4354541.js.gz
  47. 0 0
      manager-admin/dist/static/js/51.0a806238b752398a65e4.js
  48. BIN
      manager-admin/dist/static/js/51.0a806238b752398a65e4.js.gz
  49. 0 0
      manager-admin/dist/static/js/51.cde5c7e57dc7da531827.js
  50. BIN
      manager-admin/dist/static/js/51.cde5c7e57dc7da531827.js.gz
  51. 0 0
      manager-admin/dist/static/js/52.a877aa70b57ce58e1c93.js
  52. BIN
      manager-admin/dist/static/js/52.a877aa70b57ce58e1c93.js.gz
  53. 0 0
      manager-admin/dist/static/js/52.b49c55f162c77c636c11.js
  54. BIN
      manager-admin/dist/static/js/52.b49c55f162c77c636c11.js.gz
  55. BIN
      manager-admin/dist/static/js/53.36828255041b6ee36b7a.js.gz
  56. 0 0
      manager-admin/dist/static/js/53.823b881583ec056ce8b1.js
  57. 0 0
      manager-admin/dist/static/js/54.9977b444c1ca143e5947.js
  58. BIN
      manager-admin/dist/static/js/54.9977b444c1ca143e5947.js.gz
  59. 0 0
      manager-admin/dist/static/js/55.843821abd850ebf5595b.js
  60. 0 0
      manager-admin/dist/static/js/56.6207e78e34ee4251ff77.js
  61. 0 0
      manager-admin/dist/static/js/57.50e4084592e79fe1e5c3.js
  62. BIN
      manager-admin/dist/static/js/58.19e127d18f73c7ce259c.js.gz
  63. 0 0
      manager-admin/dist/static/js/58.5383c0102930721699da.js
  64. BIN
      manager-admin/dist/static/js/58.5383c0102930721699da.js.gz
  65. 0 0
      manager-admin/dist/static/js/59.90ee24c7571f4a4f38d6.js
  66. BIN
      manager-admin/dist/static/js/59.90ee24c7571f4a4f38d6.js.gz
  67. 0 0
      manager-admin/dist/static/js/60.34233906e25ff5181e9f.js
  68. BIN
      manager-admin/dist/static/js/60.34233906e25ff5181e9f.js.gz
  69. 0 0
      manager-admin/dist/static/js/60.b5b084c4fcbb9b4bbf01.js
  70. 0 0
      manager-admin/dist/static/js/61.2d500233a86688810f14.js
  71. 0 0
      manager-admin/dist/static/js/61.397428520305c029191e.js
  72. BIN
      manager-admin/dist/static/js/61.397428520305c029191e.js.gz
  73. 0 0
      manager-admin/dist/static/js/62.d2fab595a0b0b2535216.js
  74. BIN
      manager-admin/dist/static/js/62.d2fab595a0b0b2535216.js.gz
  75. 0 0
      manager-admin/dist/static/js/7.ce11d1b50a4ed2196bc7.js
  76. BIN
      manager-admin/dist/static/js/7.ce11d1b50a4ed2196bc7.js.gz
  77. 0 0
      manager-admin/dist/static/js/7.e50db1975aa5864141da.js
  78. BIN
      manager-admin/dist/static/js/7.e50db1975aa5864141da.js.gz
  79. 0 0
      manager-admin/dist/static/js/8.5a281aab4dab971eedb5.js
  80. BIN
      manager-admin/dist/static/js/8.5a281aab4dab971eedb5.js.gz
  81. 0 0
      manager-admin/dist/static/js/8.75af85065c14fa78114d.js
  82. BIN
      manager-admin/dist/static/js/8.75af85065c14fa78114d.js.gz
  83. 0 0
      manager-admin/dist/static/js/9.b88ff5e7b0319cb69c2b.js
  84. BIN
      manager-admin/dist/static/js/9.b88ff5e7b0319cb69c2b.js.gz
  85. 0 0
      manager-admin/dist/static/js/9.c275f597a7b6f62a86cc.js
  86. 0 0
      manager-admin/dist/static/js/app.1cc74651b65978c1b31d.js
  87. BIN
      manager-admin/dist/static/js/app.1cc74651b65978c1b31d.js.gz
  88. BIN
      manager-admin/dist/static/js/app.cd9c4a75a44565901668.js.gz
  89. 0 0
      manager-admin/dist/static/js/manifest.356a9d56c3d3bba24976.js
  90. 3 0
      manager-admin/src/views/basicSetting/kdnStore.vue
  91. 14 4
      manager-admin/src/views/stock/goodsExchange/addInventory.vue
  92. 10 0
      manager-admin/src/views/stock/goodsExchange/checkInventory.vue
  93. 10 0
      manager-admin/src/views/stock/goodsExchange/goodsExchangeAdd.vue
  94. 10 0
      manager-admin/src/views/stock/goodsInventory/goodsInventoryAdd.vue
  95. 1 1
      manager-admin/src/views/stock/order.vue
  96. 11 4
      manager-admin/src/views/stock/orderAdd.vue
  97. 11 0
      manager-admin/src/views/stock/orderCheck.vue
  98. 34 7
      manager-admin/src/views/stock/orderOutbound.vue
  99. 1 1
      manager-admin/src/views/stock/sendOrder.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.8fe6119a598e09bb33f5a71a79d08750.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.c7ac85f199e12e91d99c.js></script><script type=text/javascript src=/static/js/vendor.e2f2249dec469c77a1dd.js></script><script type=text/javascript src=/static/js/app.cd9c4a75a44565901668.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.8fe6119a598e09bb33f5a71a79d08750.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.356a9d56c3d3bba24976.js></script><script type=text/javascript src=/static/js/vendor.e2f2249dec469c77a1dd.js></script><script type=text/javascript src=/static/js/app.1cc74651b65978c1b31d.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/1.afe60e4ab7ed52df7957.js


BIN
manager-admin/dist/static/js/1.afe60e4ab7ed52df7957.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/1.b0da4816312c42bad6f6.js


BIN
manager-admin/dist/static/js/1.b0da4816312c42bad6f6.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/10.08522c4797a9782e3007.js


BIN
manager-admin/dist/static/js/10.08522c4797a9782e3007.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/10.4ff235388d5dd4c4e480.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/2.09d540c0f3564cc0cf0d.js


BIN
manager-admin/dist/static/js/2.09d540c0f3564cc0cf0d.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/2.d13f02a60d4601be0020.js


BIN
manager-admin/dist/static/js/2.d13f02a60d4601be0020.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/34.fee188b5e3cb6ce69ddb.js


BIN
manager-admin/dist/static/js/34.fee188b5e3cb6ce69ddb.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/35.d49b9c4eec93db9a01eb.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/36.ca50162cee1e0328ac69.js


BIN
manager-admin/dist/static/js/35.b71927b76f6135128a13.js.gz → manager-admin/dist/static/js/36.ca50162cee1e0328ac69.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/37.0c65428158a56d9b2001.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/38.1e2b83046f5da18e899e.js


BIN
manager-admin/dist/static/js/38.1e2b83046f5da18e899e.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/39.7a423f51ce2ec680aa58.js


BIN
manager-admin/dist/static/js/39.c54c60e23a7c287493f7.js.gz


BIN
manager-admin/dist/static/js/40.1f396f6928fa20157a79.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/40.6cf5567627509b781a12.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/41.6fd63fb8802e535592e0.js


BIN
manager-admin/dist/static/js/41.6fd63fb8802e535592e0.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/42.3c2b40c033cf637774d0.js


BIN
manager-admin/dist/static/js/42.3c2b40c033cf637774d0.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/43.7cca374821c015718598.js


BIN
manager-admin/dist/static/js/43.7cca374821c015718598.js.gz


BIN
manager-admin/dist/static/js/43.a9f57db7455aead862e3.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/44.5ef1697c4a5d9e13d1ae.js


BIN
manager-admin/dist/static/js/44.dada9c01e6a2c9fa6618.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/45.e8efbf421d0962b57c45.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/46.7c91a86b6a272d79df65.js


BIN
manager-admin/dist/static/js/46.7c91a86b6a272d79df65.js.gz


BIN
manager-admin/dist/static/js/47.710a56936151b404bac1.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/47.f13fe3c41907d9ee4091.js


BIN
manager-admin/dist/static/js/47.f13fe3c41907d9ee4091.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/48.1911de86d11e72e6b431.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/48.f0402e82888e8d0c07d8.js


BIN
manager-admin/dist/static/js/48.f0402e82888e8d0c07d8.js.gz


+ 1 - 1
manager-admin/dist/static/js/46.6530ec1386ad4bff21c5.js → manager-admin/dist/static/js/49.123ba9fbcdf6f4e3d03a.js

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

BIN
manager-admin/dist/static/js/49.8b5c51b613b9daf5b945.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/50.9b86716784a0d4354541.js


BIN
manager-admin/dist/static/js/50.9b86716784a0d4354541.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/51.0a806238b752398a65e4.js


BIN
manager-admin/dist/static/js/51.0a806238b752398a65e4.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/51.cde5c7e57dc7da531827.js


BIN
manager-admin/dist/static/js/51.cde5c7e57dc7da531827.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/52.a877aa70b57ce58e1c93.js


BIN
manager-admin/dist/static/js/52.a877aa70b57ce58e1c93.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/52.b49c55f162c77c636c11.js


BIN
manager-admin/dist/static/js/52.b49c55f162c77c636c11.js.gz


BIN
manager-admin/dist/static/js/53.36828255041b6ee36b7a.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/53.823b881583ec056ce8b1.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/54.9977b444c1ca143e5947.js


BIN
manager-admin/dist/static/js/54.9977b444c1ca143e5947.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/55.843821abd850ebf5595b.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/56.6207e78e34ee4251ff77.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/57.50e4084592e79fe1e5c3.js


BIN
manager-admin/dist/static/js/58.19e127d18f73c7ce259c.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/58.5383c0102930721699da.js


BIN
manager-admin/dist/static/js/57.5a0b918a99d7b019e905.js.gz → manager-admin/dist/static/js/58.5383c0102930721699da.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/59.90ee24c7571f4a4f38d6.js


BIN
manager-admin/dist/static/js/59.90ee24c7571f4a4f38d6.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/60.34233906e25ff5181e9f.js


BIN
manager-admin/dist/static/js/60.34233906e25ff5181e9f.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/60.b5b084c4fcbb9b4bbf01.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/61.2d500233a86688810f14.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/61.397428520305c029191e.js


BIN
manager-admin/dist/static/js/61.397428520305c029191e.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/62.d2fab595a0b0b2535216.js


BIN
manager-admin/dist/static/js/62.d2fab595a0b0b2535216.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/7.ce11d1b50a4ed2196bc7.js


BIN
manager-admin/dist/static/js/7.ce11d1b50a4ed2196bc7.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/7.e50db1975aa5864141da.js


BIN
manager-admin/dist/static/js/7.e50db1975aa5864141da.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/8.5a281aab4dab971eedb5.js


BIN
manager-admin/dist/static/js/8.5a281aab4dab971eedb5.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/8.75af85065c14fa78114d.js


BIN
manager-admin/dist/static/js/8.75af85065c14fa78114d.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/9.b88ff5e7b0319cb69c2b.js


BIN
manager-admin/dist/static/js/9.b88ff5e7b0319cb69c2b.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/9.c275f597a7b6f62a86cc.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/app.1cc74651b65978c1b31d.js


BIN
manager-admin/dist/static/js/app.1cc74651b65978c1b31d.js.gz


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


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/manifest.356a9d56c3d3bba24976.js


+ 3 - 0
manager-admin/src/views/basicSetting/kdnStore.vue

@@ -448,6 +448,9 @@ export default {
         submitForm() {
             this.$refs['storeForm'].validate(valid => {
                 if (valid) {
+                    if (this.storeForm.city_name === '市辖区') {
+                        this.storeForm.city_name = this.storeForm.province_name;
+                    }
                     if (this.storeForm.id) {
                         API_Branch.updateStore(this.storeForm).then(res => {
                             this.$message.success('修改成功!')

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

@@ -40,6 +40,16 @@
         <el-form-item style="width: 100%">
           <el-table :data="goodsExchangeAddForm.product_list" border :cell-style="{ textAlign: 'center' }"
             :header-cell-style="{ textAlign: 'center' }" style="width: 100%; margin-top: 20px">
+            <el-table-column label="库位号">
+              <template slot-scope="scope">
+                <el-popover placement="right" trigger="click">
+                  <div>
+                    <p v-for="item in scope.row.area_stock_list" :key="item.id">{{ item.warehouse_area_name }}</p>
+                  </div>
+                  <span slot="reference">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
+                </el-popover>
+              </template>
+            </el-table-column>
             <el-table-column label="商品编号">
               <template slot-scope="scope">
                 {{ scope.row.goods_vo.sn }}
@@ -105,7 +115,7 @@
               <template slot-scope="scope">
                 <span v-if="scope.row.order_num">{{
                   scope.row.num - scope.row.order_num || 0
-                }}</span>
+                  }}</span>
               </template>
             </el-table-column>
             <el-table-column width="200" label="操作" v-if="type !== 'detail' && type !== 'audit'">
@@ -218,7 +228,7 @@
         <el-table-column prop="order_time" label="下单时间">
           <template slot-scope="scope">{{
             scope.row.order_time | unixToDate
-          }}</template>
+            }}</template>
         </el-table-column>
         <el-table-column prop="" label="仓库名称">
           <template slot-scope="scope">
@@ -228,7 +238,7 @@
         <el-table-column prop="" 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">{{
@@ -238,7 +248,7 @@
         <el-table-column prop="" label="实付金额">
           <template slot-scope="scope">{{
             "¥" + scope.row.pay_price
-          }}</template>
+            }}</template>
         </el-table-column>
         <!-- <el-table-column prop="" label="订单状态">
           <template slot-scope="scope">

+ 10 - 0
manager-admin/src/views/stock/goodsExchange/checkInventory.vue

@@ -34,6 +34,16 @@
             <el-table :data="goodsExchangeAddForm.product_list" border :cell-style="{ textAlign: 'center' }"
               row-key="id" :header-cell-style="{ textAlign: 'center' }" class="draggable-table"
               style="width: 100%; margin-top: 20px">
+              <el-table-column label="库位号">
+                <template slot-scope="scope">
+                  <el-popover placement="right" trigger="click">
+                    <div>
+                      <p v-for="item in scope.row.area_stock_list" :key="item.id">{{ item.warehouse_area_name }}</p>
+                    </div>
+                    <span slot="reference">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
+                  </el-popover>
+                </template>
+              </el-table-column>
               <el-table-column label="商品编号">
                 <template slot-scope="scope">
                   {{ scope.row.goods_vo.sn }}

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

@@ -96,6 +96,16 @@
         <el-form-item style="width: 100%">
           <el-table :data="goodsExchangeAddForm.product_list" border :cell-style="{ textAlign: 'center' }"
             :header-cell-style="{ textAlign: 'center' }" style="width: 100%; margin-top: 20px">
+            <el-table-column label="库位号">
+              <template slot-scope="scope">
+                <el-popover placement="right" trigger="click">
+                  <div>
+                    <p v-for="item in scope.row.area_stock_list" :key="item.id">{{ item.warehouse_area_name }}</p>
+                  </div>
+                  <span slot="reference">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
+                </el-popover>
+              </template>
+            </el-table-column>
             <el-table-column label="商品编号">
               <template slot-scope="scope">
                 <span v-if="id">{{ scope.row.goods_vo.sn }}</span>

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

@@ -58,6 +58,16 @@
         <el-form-item style="width: 100%;">
           <el-table :data="goodsInventoryAddForm.product_list" border :cell-style="{ textAlign: 'center' }"
             :header-cell-style="{ textAlign: 'center' }" :loading="loading" style="width: 100%; margin-top: 20px;">
+            <el-table-column label="库位号">
+            <template slot-scope="scope">
+              <el-popover placement="right"  trigger="click">
+                <div>
+                  <p v-for="item in scope.row.area_stock_list" :key="item.id">{{ item.warehouse_area_name }}</p>
+                </div>
+                <span slot="reference">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
+              </el-popover>
+            </template>
+          </el-table-column>
             <el-table-column label="商品编号">
               <template slot-scope="scope">
                 <span v-if="id"> {{ scope.row.goods_vo.sn }}</span>

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

@@ -116,7 +116,7 @@
         </el-table-column>
         <el-table-column label="下单时间">
           <template slot-scope="scope">{{
-            scope.row.order_time | unixToDate
+            scope.row.create_time | unixToDate
             }}</template>
         </el-table-column>
         <el-table-column prop="warehouse_id" label="仓库名称">

+ 11 - 4
manager-admin/src/views/stock/orderAdd.vue

@@ -152,6 +152,16 @@
               {{ warehouseName(scope.row.warehouse_id) }}
             </template>
           </el-table-column>
+          <el-table-column label="库位号">
+            <template slot-scope="scope">
+              <el-popover placement="right"  trigger="click">
+                <div>
+                  <p v-for="item in scope.row.area_stock_list" :key="item.id">{{ item.warehouse_area_name }}</p>
+                </div>
+                <span slot="reference">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
+              </el-popover>
+            </template>
+          </el-table-column>
           <el-table-column label="商品编号">
             <template slot-scope="scope">
               {{ scope.row.goods_vo.sn }}
@@ -1335,10 +1345,7 @@ export default {
       params.pay_price = this.price;
       params.real_price = Number(params.real_price);
       params.item_list = params.product_list;
-      /* params.product_list.map((el) => {
-        el.goods_id = el.id;
-        el.id = "";
-      });*/
+
       params.order_time = Math.floor(params.order_time / 1000);
       params.payment_time = Math.floor(params.payment_time / 1000);
       this.formLoading = true;

+ 11 - 0
manager-admin/src/views/stock/orderCheck.vue

@@ -120,6 +120,17 @@
                             {{ warehouseName(scope.row.warehouse_id) }}
                         </template>
                     </el-table-column>
+                    <el-table-column label="库位号">
+                        <template slot-scope="scope">
+                            <el-popover placement="right" trigger="click">
+                                <div>
+                                    <p v-for="item in scope.row.area_stock_list" :key="item.id">{{
+                                        item.warehouse_area_name }}</p>
+                                </div>
+                                <span slot="reference">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
+                            </el-popover>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="商品编号">
                         <template slot-scope="scope">
                             {{ scope.row.goods_vo.sn }}

+ 34 - 7
manager-admin/src/views/stock/orderOutbound.vue

@@ -169,7 +169,7 @@
           <el-divider></el-divider>
           <h3>商品明细</h3>
           <el-button class="button" size="mini" type="primary" @click="scanCode"
-           v-if="deliveryForms.status=='TO_BE_SEND'">扫码出库</el-button>
+            v-if="deliveryForms.status == 'TO_BE_SEND'">扫码出库</el-button>
           <div style="width: 100%; display: block">
             <el-table border :data="goodsExchangeAddForm.product_list" :cell-style="{ textAlign: 'center' }"
               :header-cell-style="{ textAlign: 'center' }" style="width: 100%; margin-top: 20px">
@@ -189,9 +189,14 @@
                 </template>
               </el-table-column>
               <el-table-column label="库位号">
-                <!-- <template slot-scope="scope">
-                  <span>{{ scope.row.product_vo.sku }}</span>
-                </template> -->
+                <template slot-scope="scope">
+                  <el-popover placement="right" trigger="click">
+                    <div>
+                      <p v-for="item in scope.row.area_stock_list" :key="item.id">{{ item.warehouse_area_name }}</p>
+                    </div>
+                    <span slot="reference">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
+                  </el-popover>
+                </template>
               </el-table-column>
               <el-table-column label="序列号" v-if="sn_code_list">
                 <template slot-scope="scope">
@@ -462,6 +467,28 @@
                 </p>
               </div>
             </el-step>
+            <el-step icon="el-icon-success" v-if="JSON.stringify(deliveryForms.cancel_order_kdn) !== '{}'" :title="deliveryForms.create_order_success.orderStatus == 500
+              ? '拒绝接单'
+              : ''
+              ">
+              <div slot="description">
+                <p class="row-remark">
+                  订单号:{{ deliveryForms.create_order_success.orderCode }}
+                </p>
+                <p class="row-remark">
+                  物流单号:{{ deliveryForms.create_order_success.channelOrderCode }}
+                </p>
+                <p class="row-remark">
+                  {{ deliveryForms.create_order_success.remark }}
+                </p>
+                <p class="row-time">
+                  {{
+                    (deliveryForms.create_order_success.requestTime / 1000)
+                    | unixToDate
+                  }}
+                </p>
+              </div>
+            </el-step>
           </el-steps>
         </div>
       </div>
@@ -631,7 +658,7 @@ export default {
         total_volume: "",
         appointment_type: 0,
         total_weight: "",
-        status:'',
+        status: '',
         //发货人
         sender: {
           name: "",
@@ -887,7 +914,7 @@ export default {
         if (this.goodsExchangeAddForm.product_list[this.index].num == this.product_list[indexs].num) {
           this.scanGoodsForm.bar_code = "";
           return this.$message.warning('录入完成,请录入下一条!')
-         /*  this.scanDialogVisible = false; */
+          /*  this.scanDialogVisible = false; */
         } else {
           this.scanGoodsForm.bar_code = "";
           this.$nextTick(() => {
@@ -1266,7 +1293,7 @@ export default {
             console.log(el.orderNum);
           });
         })
-        this.deliveryForms.status=res.status
+        this.deliveryForms.status = res.status
         this.deliveryForms.warehouse_id = res.warehouse_id
         this.deliveryForms.declared_value = Number(res.order_vo.real_price);
         this.goodsExchangeAddForm.product_list = res.order_item_vos

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

@@ -78,7 +78,7 @@
         </el-table-column>
         <el-table-column prop="order_time" label="下单时间">
           <template slot-scope="scope">{{
-            scope.row.order_vo.order_time | unixToDate
+            scope.row.create_time | unixToDate
             }}</template>
         </el-table-column>
         <el-table-column prop="warehouse_name" label="仓库名称">

Some files were not shown because too many files changed in this diff