yangg 1 rok pred
rodič
commit
c15ea1563c
88 zmenil súbory, kde vykonal 147 pridanie a 71 odobranie
  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.f9af13330d37a3dbcdba.js
  5. BIN
      manager-admin/dist/static/js/1.f9af13330d37a3dbcdba.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.cb4d57e0f8112e47379a.js
  10. BIN
      manager-admin/dist/static/js/2.cb4d57e0f8112e47379a.js.gz
  11. BIN
      manager-admin/dist/static/js/2.d13f02a60d4601be0020.js.gz
  12. 0 0
      manager-admin/dist/static/js/30.c6504fcfaaedd9bf62c0.js
  13. BIN
      manager-admin/dist/static/js/30.c6504fcfaaedd9bf62c0.js.gz
  14. 0 0
      manager-admin/dist/static/js/31.ba61025faa41bdbc8dd0.js
  15. 0 0
      manager-admin/dist/static/js/32.c15e345fa7de863bc3c8.js
  16. 0 0
      manager-admin/dist/static/js/33.a5adf2b647d47ffad1cf.js
  17. 0 0
      manager-admin/dist/static/js/34.8cd4bb6c56d90b51400d.js
  18. BIN
      manager-admin/dist/static/js/34.8cd4bb6c56d90b51400d.js.gz
  19. BIN
      manager-admin/dist/static/js/34.fee188b5e3cb6ce69ddb.js.gz
  20. 0 0
      manager-admin/dist/static/js/35.f2263d2ed406921175e9.js
  21. BIN
      manager-admin/dist/static/js/35.f2263d2ed406921175e9.js.gz
  22. BIN
      manager-admin/dist/static/js/36.ca50162cee1e0328ac69.js.gz
  23. 0 0
      manager-admin/dist/static/js/36.dc86ccf0b7094e9d38a2.js
  24. 0 0
      manager-admin/dist/static/js/37.9a36603ef38fbf1ca8b5.js
  25. BIN
      manager-admin/dist/static/js/37.9a36603ef38fbf1ca8b5.js.gz
  26. 0 0
      manager-admin/dist/static/js/38.1e2b83046f5da18e899e.js
  27. BIN
      manager-admin/dist/static/js/38.1e2b83046f5da18e899e.js.gz
  28. 0 0
      manager-admin/dist/static/js/38.6a57f50549647ddffc75.js
  29. 0 0
      manager-admin/dist/static/js/43.7cca374821c015718598.js
  30. BIN
      manager-admin/dist/static/js/43.7cca374821c015718598.js.gz
  31. 0 0
      manager-admin/dist/static/js/43.e867a7fa8276df67c9da.js
  32. 0 0
      manager-admin/dist/static/js/44.93984050f5e96ec69cbb.js
  33. 0 0
      manager-admin/dist/static/js/45.a0551b4f4c1aa05e2969.js
  34. BIN
      manager-admin/dist/static/js/45.a0551b4f4c1aa05e2969.js.gz
  35. 0 0
      manager-admin/dist/static/js/46.7418b356c5279c486cbc.js
  36. BIN
      manager-admin/dist/static/js/46.7418b356c5279c486cbc.js.gz
  37. 0 0
      manager-admin/dist/static/js/47.7eb80c72d4469841df59.js
  38. BIN
      manager-admin/dist/static/js/47.f13fe3c41907d9ee4091.js.gz
  39. 0 0
      manager-admin/dist/static/js/48.3a8630374b7674f057fa.js
  40. BIN
      manager-admin/dist/static/js/48.3a8630374b7674f057fa.js.gz
  41. BIN
      manager-admin/dist/static/js/50.9b86716784a0d4354541.js.gz
  42. 0 0
      manager-admin/dist/static/js/50.c383b47d5db0dca3aac1.js
  43. BIN
      manager-admin/dist/static/js/50.c383b47d5db0dca3aac1.js.gz
  44. BIN
      manager-admin/dist/static/js/51.0a806238b752398a65e4.js.gz
  45. 0 0
      manager-admin/dist/static/js/51.2ff1910ce4799eb24c13.js
  46. BIN
      manager-admin/dist/static/js/51.2ff1910ce4799eb24c13.js.gz
  47. 0 0
      manager-admin/dist/static/js/52.9f7971fc567ff1f5f078.js
  48. BIN
      manager-admin/dist/static/js/52.a877aa70b57ce58e1c93.js.gz
  49. 0 0
      manager-admin/dist/static/js/53.36828255041b6ee36b7a.js
  50. BIN
      manager-admin/dist/static/js/53.36828255041b6ee36b7a.js.gz
  51. BIN
      manager-admin/dist/static/js/54.9977b444c1ca143e5947.js.gz
  52. 0 0
      manager-admin/dist/static/js/54.ccf370f936f89890b081.js
  53. 0 0
      manager-admin/dist/static/js/55.8c778a01d0ba9e3e90c4.js
  54. 0 0
      manager-admin/dist/static/js/56.78f34000c4a63f153ae6.js
  55. 0 0
      manager-admin/dist/static/js/57.dac502eeff15d83a9822.js
  56. BIN
      manager-admin/dist/static/js/57.dac502eeff15d83a9822.js.gz
  57. 0 0
      manager-admin/dist/static/js/6.965b0e5c9e5fb4d4a5c7.js
  58. BIN
      manager-admin/dist/static/js/6.965b0e5c9e5fb4d4a5c7.js.gz
  59. 0 0
      manager-admin/dist/static/js/7.ce11d1b50a4ed2196bc7.js
  60. BIN
      manager-admin/dist/static/js/7.ce11d1b50a4ed2196bc7.js.gz
  61. 0 0
      manager-admin/dist/static/js/7.d62ac25830eb485d6408.js
  62. BIN
      manager-admin/dist/static/js/7.d62ac25830eb485d6408.js.gz
  63. 0 0
      manager-admin/dist/static/js/8.75af85065c14fa78114d.js
  64. BIN
      manager-admin/dist/static/js/8.75af85065c14fa78114d.js.gz
  65. 0 0
      manager-admin/dist/static/js/8.97610580669c4dba7ff8.js
  66. BIN
      manager-admin/dist/static/js/8.97610580669c4dba7ff8.js.gz
  67. 0 0
      manager-admin/dist/static/js/9.a4cee323fabfad907a99.js
  68. BIN
      manager-admin/dist/static/js/9.a4cee323fabfad907a99.js.gz
  69. 0 0
      manager-admin/dist/static/js/9.c275f597a7b6f62a86cc.js
  70. BIN
      manager-admin/dist/static/js/app.1cc74651b65978c1b31d.js.gz
  71. 0 0
      manager-admin/dist/static/js/app.d4d8e57c6a8f3a83890f.js
  72. BIN
      manager-admin/dist/static/js/app.d4d8e57c6a8f3a83890f.js.gz
  73. 0 0
      manager-admin/dist/static/js/manifest.07bab5c24890fc872786.js
  74. 2 2
      manager-admin/src/views/dashboard/index.vue
  75. 3 3
      manager-admin/src/views/stock/LockedStock.vue
  76. 7 2
      manager-admin/src/views/stock/goodsExchange/addInventory.vue
  77. 2 2
      manager-admin/src/views/stock/goodsExchange/checkInventory.vue
  78. 2 2
      manager-admin/src/views/stock/goodsExchange/goodsExchangeAdd.vue
  79. 3 3
      manager-admin/src/views/stock/goodsInventory/goodsInventoryAdd.vue
  80. 2 2
      manager-admin/src/views/stock/goodsLend.vue
  81. 2 2
      manager-admin/src/views/stock/goodsTransfer.vue
  82. 74 42
      manager-admin/src/views/stock/order.vue
  83. 2 2
      manager-admin/src/views/stock/orderAdd.vue
  84. 34 3
      manager-admin/src/views/stock/orderCheck.vue
  85. 2 2
      manager-admin/src/views/stock/orderOutbound.vue
  86. 2 1
      ui-components/PickerGoods/src/defaultOptions.js
  87. 8 1
      ui-components/PickerGoods/src/main.vue
  88. 1 1
      ui-components/PickerWarehouseEntryBatch/src/main.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.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>
+    // 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.07bab5c24890fc872786.js></script><script type=text/javascript src=/static/js/vendor.e2f2249dec469c77a1dd.js></script><script type=text/javascript src=/static/js/app.d4d8e57c6a8f3a83890f.js></script></body></html>

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/1.afe60e4ab7ed52df7957.js


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/1.f9af13330d37a3dbcdba.js


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/10.08522c4797a9782e3007.js


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/10.4ff235388d5dd4c4e480.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/2.cb4d57e0f8112e47379a.js


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


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/30.c6504fcfaaedd9bf62c0.js


BIN
manager-admin/dist/static/js/30.c6504fcfaaedd9bf62c0.js.gz


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/31.ba61025faa41bdbc8dd0.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/32.c15e345fa7de863bc3c8.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/33.a5adf2b647d47ffad1cf.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/34.8cd4bb6c56d90b51400d.js


BIN
manager-admin/dist/static/js/33.688f0cd6feccc682b283.js.gz → manager-admin/dist/static/js/34.8cd4bb6c56d90b51400d.js.gz


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/35.f2263d2ed406921175e9.js


BIN
manager-admin/dist/static/js/35.f2263d2ed406921175e9.js.gz


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/36.dc86ccf0b7094e9d38a2.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/37.9a36603ef38fbf1ca8b5.js


BIN
manager-admin/dist/static/js/37.9a36603ef38fbf1ca8b5.js.gz


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/38.1e2b83046f5da18e899e.js


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/38.6a57f50549647ddffc75.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/43.7cca374821c015718598.js


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/43.e867a7fa8276df67c9da.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/44.93984050f5e96ec69cbb.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/45.a0551b4f4c1aa05e2969.js


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/46.7418b356c5279c486cbc.js


BIN
manager-admin/dist/static/js/46.7418b356c5279c486cbc.js.gz


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/47.7eb80c72d4469841df59.js


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/48.3a8630374b7674f057fa.js


BIN
manager-admin/dist/static/js/48.3a8630374b7674f057fa.js.gz


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/50.c383b47d5db0dca3aac1.js


BIN
manager-admin/dist/static/js/50.c383b47d5db0dca3aac1.js.gz


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/51.2ff1910ce4799eb24c13.js


BIN
manager-admin/dist/static/js/51.2ff1910ce4799eb24c13.js.gz


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/52.9f7971fc567ff1f5f078.js


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/53.36828255041b6ee36b7a.js


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


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/54.ccf370f936f89890b081.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/55.8c778a01d0ba9e3e90c4.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/56.78f34000c4a63f153ae6.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/57.dac502eeff15d83a9822.js


BIN
manager-admin/dist/static/js/57.dac502eeff15d83a9822.js.gz


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/6.965b0e5c9e5fb4d4a5c7.js


BIN
manager-admin/dist/static/js/6.965b0e5c9e5fb4d4a5c7.js.gz


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/7.ce11d1b50a4ed2196bc7.js


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/7.d62ac25830eb485d6408.js


BIN
manager-admin/dist/static/js/6.7dccafff9023d6860fff.js.gz → manager-admin/dist/static/js/7.d62ac25830eb485d6408.js.gz


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/8.75af85065c14fa78114d.js


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/8.97610580669c4dba7ff8.js


BIN
manager-admin/dist/static/js/8.97610580669c4dba7ff8.js.gz


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/9.a4cee323fabfad907a99.js


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/9.c275f597a7b6f62a86cc.js


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/app.d4d8e57c6a8f3a83890f.js


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
manager-admin/dist/static/js/manifest.07bab5c24890fc872786.js


+ 2 - 2
manager-admin/src/views/dashboard/index.vue

@@ -135,7 +135,7 @@
             </router-link>
           </div>
           <div class="goods-statistics">
-            <el-table :data="OrderList.records" height="280" :loading="loading" :header-cell-style="{ textAlign: 'center' }">
+            <el-table :data="OrderList.records"  :loading="loading" :header-cell-style="{ textAlign: 'center' }">
               <el-table-column prop="order_vo.sn" label="订单编号">
               </el-table-column>
               <el-table-column prop="warehouse_name" label="仓库名称">
@@ -216,7 +216,7 @@
             </router-link>
           </div>
           <div class="goods-statistics">
-            <el-table  :data="goodsLendListWaitReturnData.data" :loading="loading" height="280" 
+            <el-table  :data="goodsLendListWaitReturnData.data" :loading="loading"  
               :header-cell-style="{ textAlign: 'center' }">
               <el-table-column prop="sn" label="订单编号">
               </el-table-column>

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

@@ -5,8 +5,8 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="解冻时间">
-                            <el-date-picker v-model="time" type="daterange"
-                                align="center" :editable="false" unlink-panels :clearable="false"
+                            <el-date-picker v-model="time" type="daterange" 
+                                align="center" :editable="false" unlink-panels :clearable="true"
                                 :default-time="['00:00:00', '23:59:59']" range-separator="-" start-placeholder="开始日期"
                                 value-format="timestamp" end-placeholder="结束日期" :picker-options="{
                                     disabledDate(time) {
@@ -18,7 +18,7 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="状态">
-                            <el-select v-model="advancedForm.status">
+                            <el-select v-model="advancedForm.status" clearable>
                                 <el-option label="解冻" :value="true" />
                                 <el-option label="未解冻" :value="false" />
                             </el-select>

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

@@ -42,11 +42,11 @@
             :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">
+                <el-popover placement="right" trigger="click" v-if="scope.row.area_stock_list">
                   <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>
+                  <span slot="reference" v-if="scope.row.area_stock_list.length!==0">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
                 </el-popover>
               </template>
             </el-table-column>
@@ -200,6 +200,11 @@
           </template> -->
         </el-table-column>
         <el-table-column prop="product_vo.unit" label="单位"> </el-table-column>
+        <el-table-column prop="" label="商品类型">
+          <template slot-scope="scope">
+            {{ scope.row.goods_vo.hire_or_sail=='sail' ? '售卖商品' : '租赁商品' }}
+          </template>
+        </el-table-column> 
         <!-- <el-table-column prop="product_list.stock_num" label="库存数量"> </el-table-column> -->
       </el-table>
       <el-pagination @size-change="goodsPageSizeChange" @current-change="goodsPageCurrentChange"

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

@@ -36,11 +36,11 @@
               style="width: 100%; margin-top: 20px">
               <el-table-column label="库位号">
                 <template slot-scope="scope">
-                  <el-popover placement="right" trigger="click">
+                  <el-popover placement="right" trigger="click" v-if="scope.row.area_stock_list">
                     <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>
+                    <span slot="reference" v-if="scope.row.area_stock_list.length!==0">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
                   </el-popover>
                 </template>
               </el-table-column>

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

@@ -98,11 +98,11 @@
             :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">
+                <el-popover placement="right" trigger="click" v-if="scope.row.area_stock_list">
                   <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>
+                  <span slot="reference" v-if="scope.row.area_stock_list.length!==0">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
                 </el-popover>
               </template>
             </el-table-column>

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

@@ -58,13 +58,13 @@
         <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="库位号">
+            <el-table-column label="库位号" >
             <template slot-scope="scope">
-              <el-popover placement="right"  trigger="click">
+              <el-popover placement="right"  trigger="click" v-if="scope.row.area_stock_list">
                 <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>
+                <span slot="reference" v-if="scope.row.area_stock_list.length!==0">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
               </el-popover>
             </template>
           </el-table-column>

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

@@ -53,7 +53,7 @@
                   ></el-cascader>
                 </el-form-item>
                 <el-form-item label="状态">
-                  <el-select v-model="advancedForm.status">
+                  <el-select v-model="advancedForm.status" clearable>
                     <el-option key="NEW" label="新创建" value="NEW" />
                     <el-option
                       key="CONFIRMED"
@@ -70,7 +70,7 @@
                     align="center"
                     :editable="false"
                     unlink-panels
-                    :clearable="false"
+                    :clearable="true"
                     :default-time="['00:00:00', '23:59:59']"
                     range-separator="-"
                     start-placeholder="开始日期"

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

@@ -5,14 +5,14 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="仓库">
-              <el-select v-model="advancedForm.warehouse_id">
+              <el-select v-model="advancedForm.warehouse_id" clearable>
                 <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="商品编号/sku/序列号">
-              <el-input v-model="advancedForm.keyword" placeholder="请输入内容" width="200px"></el-input>
+              <el-input v-model="advancedForm.keyword" clearable placeholder="请输入内容" width="200px"></el-input>
             </el-form-item>
           </el-col>
         </el-row>

+ 74 - 42
manager-admin/src/views/stock/order.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-  <!--   <div class="btn">
+    <!--   <div class="btn">
       <el-button type="primary">同步订单</el-button>
     </div> -->
     <div class="search">
@@ -162,17 +162,17 @@
               @click="handleSubmit(scope.row.id)">确认</el-button> -->
             <el-button size="mini" @click="handleEdit(scope.row)"
               v-if="(scope.row.status === 'TO_BE_COMMIT' || scope.row.status === 'TO_BE_SEND') && checkPermission(['orderEdit'])">编辑</el-button>
-            <el-button size="mini" type="danger" v-if="scope.row.type === 'TO_C' && checkPermission(['extensionUpdate'])"
+            <el-button size="mini" v-if="scope.row.type === 'TO_C' && checkPermission(['extensionUpdate'])"
               @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="primary" v-if="!scope.row.has_pay_return && scope.row.type === 'TO_C'"
+            <el-button size="mini" v-if="!scope.row.has_pay_return" @click="payTypes(scope.row)">支付</el-button>
+            <el-button size="mini" 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;"
+            <el-button size="mini" style="margin-top: 5px;"
               v-if="scope.row.status !== 'TO_BE_SEND' && checkPermission(['orderReturn2:add'])"
               @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') && checkPermission(['order:withdraw'])">撤销</el-button>
+              v-if="(scope.row.status === 'TO_BE_COMMIT' || scope.row.status === 'TO_BE_SEND') && checkPermission(['order:withdraw'])"
+              type="danger">撤销</el-button>
           </template>
 
         </el-table-column>
@@ -182,34 +182,40 @@
         :page-size="pageData.page_size" layout="total, sizes, prev, pager, next, jumper" :total="pageData.data_total">
       </el-pagination>
     </en-table-layout>
-    <el-dialog title="扫码支付" :visible.sync="payVisible" width="30%" :close-on-click-modal="false" @close="closeDialog">
-      <div id="qrCode" style="    display: flex;
-    justify-content: center;" ref="qrCodeDiv"></div>
+    <el-dialog title="扫码支付(支付宝)" :visible.sync="payVisible" width="30%" :close-on-click-modal="false"
+      @close="closeDialog">
+     
+      <div id="qrCode" style="display:  flex;justify-content: center;"  ref="qrCodeDiv">
+        <!-- 二维码容器 -->
+        <div class="qr-code"></div>
+        <!-- Logo 图片 -->
+        <div ref="qrCodeDiv1"></div>
+      </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>
+      <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>
+        <el-button @click="reimburVisible = false">取 消</el-button>
+        <el-button type="primary" @click="addReimburForm">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -265,11 +271,11 @@ export default {
       pay_price: 0,
       reimburVisible: false,
       reimburForm: {
-        order_id:'',
-        money:"",
+        order_id: '',
+        money: "",
         file_url: ''
       },
-      
+
     };
   },
   mounted() {
@@ -298,19 +304,19 @@ export default {
   },
   methods: {
     //提交报销单
-    addReimburForm(){
-      API_order.addOrderCustomerFee(this.reimburForm).then(res=>{
+    addReimburForm() {
+      API_order.addOrderCustomerFee(this.reimburForm).then(res => {
         this.$message.success('添加成功')
         this.reimburVisible = false
-        this.reimburForm={}
+        this.reimburForm = {}
       })
     },
     handleAvatarSuccess(res, file) {
-      this.reimburForm.file_url =file.response.url
-     // this.reimburForm.file_url = URL.createObjectURL(file.raw);
+      this.reimburForm.file_url = file.response.url
+      // this.reimburForm.file_url = URL.createObjectURL(file.raw);
     },
     beforeAvatarUpload(file) {
-  
+
       const isLt2M = file.size / 1024 / 1024 < 10;
 
       /* if (!isJPG) {isJPG &&    const isJPG = file.type === 'image/jpeg';
@@ -319,11 +325,11 @@ export default {
       if (!isLt2M) {
         this.$message.error('上传头像图片大小不能超过 10MB!');
       }
-      return  isLt2M;
+      return isLt2M;
     },
     /* 报销 */
     reimbursement(row) {
-      this.reimburForm.order_id=row.id
+      this.reimburForm.order_id = row.id
       this.reimburVisible = true
     },
     //撤销
@@ -367,8 +373,34 @@ export default {
           colorLight: "#ffffff", //二维码背景色
           correctLevel: QRCode.CorrectLevel.L//容错率,L/M/H
         })
+
+        /* this.positionLogo() */
       }, 500);
     },
+    positionLogo() {
+      let qrcode = new QRCode(this.$refs.qrCodeDiv, {
+        text: this.payurl + '#/payType?id=' + this.payCode + '&sn=' + this.paySn + '&price=' + this.pay_price,
+        width: 200,
+        height: 200,
+        colorDark: "#333333", //二维码颜色
+        colorLight: "#ffffff", //二维码背景色
+        correctLevel: QRCode.CorrectLevel.L//容错率,L/M/H
+      })
+      let logo = new Image();
+      logo.crossOrigin = 'Anonymous';
+      logo.src = "https://img2.baidu.com/it/u=3765512519,3278388264&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=500"
+      let that = this;
+      let con = this.$refs.qrCodeDiv1;
+      logo.onload = function () {
+        let container = con;
+        let qrImg = qrcode._el.getElementsByTagName('img')[0];
+        let canvas = qrcode._el.getElementsByTagName('canvas')[0];
+        var ctx = canvas.getContext("2d");
+        ctx.drawImage(logo, 162 * 0.5 - 22, 162 * 0.5 - 22, 44, 44);
+        qrImg.src = canvas.toDataURL();
+        container.appendChild(qrcode._el);
+      }
+    },
     memberType(val) {
       let name = "";
       this.customerList.map((el) => {

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

@@ -154,11 +154,11 @@
           </el-table-column>
           <el-table-column label="库位号">
             <template slot-scope="scope">
-              <el-popover placement="right"  trigger="click">
+              <el-popover placement="right"  trigger="click" v-if="scope.row.area_stock_list">
                 <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>
+                <span slot="reference" v-if="scope.row.area_stock_list.length!==0">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
               </el-popover>
             </template>
           </el-table-column>

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

@@ -127,7 +127,8 @@
                                     <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>
+                                <span slot="reference" v-if="scope.row.area_stock_list.length !== 0">{{
+                                    scope.row.area_stock_list[0].warehouse_area_name }}</span>
                             </el-popover>
                         </template>
                     </el-table-column>
@@ -221,6 +222,12 @@
                         <!-- <el-input v-model="OrderForm.real_price" placeholder="请输入" :disabled="type == 'pone'"></el-input> -->
                     </el-form-item>
                 </el-col>
+                <el-col :span="16" v-if="OrderForm.type == 'TO_C' && id">
+                    <el-form-item label="交通费汇总:" prop="real_price">
+                        <span>{{ '¥' + TO_Cmoney }} </span>
+                        <el-button @click="reimList">查看明细</el-button>
+                    </el-form-item>
+                </el-col>
                 <el-col :span="8">
                     <el-form-item label="扫码支付(支付宝):" prop="real_price" :rules="rules.pay_price">
                         <div id="qrCode" ref="qrCodeDiv"></div>
@@ -234,7 +241,7 @@
                     :loading="formLoading">保存</el-button>
                 <el-button type="primary" @click="saveSubmitOrderForm" v-if="!isDetail && type !== 'pone'"
                     :loading="formLoading">确认并保存</el-button> -->
-                <el-button @click="printIng" :disabled="false" v-if="isDetail">打印</el-button>
+                <el-button @click="printIng" :disabled="false">打印</el-button>
                 <el-button @click="roBack()" :disabled="false">返回</el-button>
             </div>
         </el-form>
@@ -294,6 +301,24 @@
                 <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>
+            <!--  <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>
     </div>
 </template>
 
@@ -584,7 +609,9 @@ export default {
             payurl: "",
             channList: [],//渠道列表
             totalAmount: 0,
-            TO_Cmoney: 0//交通费汇总
+            TO_Cmoney: 0,//交通费汇总
+            reimListVisible: false,
+            reimburVisible: false,
         };
     },
     computed: {
@@ -605,6 +632,10 @@ export default {
 
     },
     methods: {
+        /* 交通费明细 */
+        reimList() {
+            this.reimListVisible = true
+        },
         getchannName(value) {
             const type = this.channList.find(type => type.id === value);
             return type ? type.name : '未知类型';

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

@@ -190,11 +190,11 @@
               </el-table-column>
               <el-table-column label="库位号">
                 <template slot-scope="scope">
-                  <el-popover placement="right" trigger="click">
+                  <el-popover placement="right" trigger="click" v-if="scope.row.area_stock_list">
                     <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>
+                    <span slot="reference" v-if="scope.row.area_stock_list.length!==0">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
                   </el-popover>
                 </template>
               </el-table-column>

+ 2 - 1
ui-components/PickerGoods/src/defaultOptions.js

@@ -55,5 +55,6 @@ export const generalColumns = [
   { label: '商品编号', prop: 'goods_vo.sn' },
   { label: '商品名称', prop: 'goods_vo.name' },
   { label: '规格型号', prop: 'product_vo.spec_name' },
-  { label: '库存数量', prop: 'usable_stock' }
+  { label: '库存数量', prop: 'usable_stock' },
+  { label: '商品类别',   prop: 'goods_vo.hire_or_sail'},
 ]

+ 8 - 1
ui-components/PickerGoods/src/main.vue

@@ -21,7 +21,14 @@
         </el-table-column>
         <el-table-column v-else type="selection" label="选择" width="55" :selectable="checkDisable" reserve-selection
           align="center" />
-        <el-table-column v-for="column in columns" :key="column.label" align="center" v-bind="column">
+        <el-table-column v-for="column in columns" :key="column.label" v-if="column.prop !== 'goods_vo.hire_or_sail'" align="center" v-bind="column">
+         
+         <!--  <template slot-scope="scope" v-if="scope.row.warehouse_id">
+            {{ scope.row.warehouse_id }}
+          </template>-->
+        </el-table-column> 
+        <el-table-column v-for="column in columns" :key="column.label" v-if="column.prop === 'goods_vo.hire_or_sail'" align="center" v-bind="column">
+          <template slot-scope="scope"> {{ scope.row.goods_vo.hire_or_sail=='sail' ? '售卖商品' : '租赁商品'  }}</template>
          <!--  <template slot-scope="scope" v-if="scope.row.warehouse_id">
             {{ scope.row.warehouse_id }}
           </template> -->

+ 1 - 1
ui-components/PickerWarehouseEntryBatch/src/main.vue

@@ -29,7 +29,7 @@
           align="center" />
         <el-table-column v-for="column in columns" v-if="column.prop !== 'goods_vo.hire_or_sail'" :key="column.label" align="center"
           v-bind="column" >
-          
+
         </el-table-column>
         <el-table-column v-for="column in columns" v-if="column.prop === 'goods_vo.hire_or_sail'" :key="column.label" align="center"
           v-bind="column">

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov