mushencc 1 gadu atpakaļ
vecāks
revīzija
db5b63f0f7
55 mainītis faili ar 657 papildinājumiem un 99 dzēšanām
  1. 0 0
      dist/index.html
  2. 1 1
      dist/static/css/app.817d81b5.css
  3. 0 1
      dist/static/css/chunk-26d01dfa.9738d400.css
  4. 0 1
      dist/static/css/chunk-2a30b7a1.9d525d58.css
  5. 1 0
      dist/static/css/chunk-2af58fa3.2688627c.css
  6. 1 0
      dist/static/css/chunk-2d4fa2a4.0887c19c.css
  7. 0 1
      dist/static/css/chunk-2f323a42.6a245573.css
  8. 1 0
      dist/static/css/chunk-40011ee0.36ba9e66.css
  9. 1 0
      dist/static/css/chunk-401bb844.a00abff9.css
  10. 0 1
      dist/static/css/chunk-50d16776.27071a14.css
  11. 1 0
      dist/static/css/chunk-6642ad0c.2aaca7ed.css
  12. 1 0
      dist/static/css/chunk-6675a5ce.5fd3ff09.css
  13. 0 1
      dist/static/css/chunk-6af21413.b25b4a01.css
  14. 1 0
      dist/static/css/chunk-6c8c1f7c.48f8be4c.css
  15. 0 1
      dist/static/css/chunk-75d70626.fd68e53a.css
  16. 0 1
      dist/static/css/chunk-7e9e957b.ef8a19f1.css
  17. 1 0
      dist/static/css/chunk-8d7034fa.aac27aa2.css
  18. 1 0
      dist/static/css/chunk-e5911432.cd72123a.css
  19. 0 0
      dist/static/js/app.30ec42fb.js
  20. 0 0
      dist/static/js/app.375097db.js
  21. 0 0
      dist/static/js/chunk-03f11e0c.dd92df7b.js
  22. 0 0
      dist/static/js/chunk-05cd0a2c.b8a12fb5.js
  23. 0 0
      dist/static/js/chunk-2af58fa3.de9a5d7e.js
  24. 0 1
      dist/static/js/chunk-2d21022e.6ceaa6de.js
  25. 1 0
      dist/static/js/chunk-2d21022e.aaaf816e.js
  26. 0 0
      dist/static/js/chunk-2d4fa2a4.79ff2e95.js
  27. 0 0
      dist/static/js/chunk-2f323a42.2e04f312.js
  28. 0 0
      dist/static/js/chunk-3b2bb27f.7bcb804d.js
  29. 0 0
      dist/static/js/chunk-40011ee0.1cafd732.js
  30. 0 0
      dist/static/js/chunk-401bb844.93f01109.js
  31. 0 0
      dist/static/js/chunk-430782b8.89066aed.js
  32. 0 0
      dist/static/js/chunk-59d32064.03139606.js
  33. 0 0
      dist/static/js/chunk-6642ad0c.fdb16169.js
  34. 0 0
      dist/static/js/chunk-6675a5ce.c2775cf9.js
  35. 0 0
      dist/static/js/chunk-698e9c2a.468eafac.js
  36. 0 0
      dist/static/js/chunk-6af21413.7f8e5a11.js
  37. 0 0
      dist/static/js/chunk-6c8c1f7c.5dd0e020.js
  38. 0 0
      dist/static/js/chunk-6e4aceda.cb3235a5.js
  39. 0 0
      dist/static/js/chunk-7e9e957b.5779aaa9.js
  40. 0 0
      dist/static/js/chunk-8d7034fa.6f437a46.js
  41. 1 1
      dist/static/js/chunk-e5911432.5a87eeca.js
  42. 4 3
      src/main.js
  43. 18 0
      src/routerMap/index.js
  44. 6 4
      src/views/cms.vue
  45. 35 9
      src/views/page/Dispatch/detail.vue
  46. 13 5
      src/views/page/Finish/detail.vue
  47. 54 54
      src/views/page/Finish/detailed.vue
  48. 7 4
      src/views/page/Home.vue
  49. 15 3
      src/views/page/Inventory/detail.vue
  50. 232 0
      src/views/page/Inventory/index.vue
  51. 2 2
      src/views/page/Package/detail.vue
  52. 232 0
      src/views/page/Package/index.vue
  53. 5 2
      src/views/page/print.vue
  54. 2 3
      src/views/page/refresh.vue
  55. 20 0
      utils/util.js

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/index.html


+ 1 - 1
dist/static/css/app.72122810.css → dist/static/css/app.817d81b5.css

@@ -1 +1 @@
-#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#fff;height:100vh;width:100vw}.content{background-image:url(../../static/img/bc.ffc3491e.png);background-repeat:no-repeat;background-size:cover}#nav{padding:30px}#nav a{font-weight:700;color:#2c3e50}#nav a.router-link-exact-active{color:#42b983}ol,ul{padding:0!important}
+#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#000;height:100vh;width:100vw}.content{background-image:url(../../static/img/bc.ffc3491e.png);background-repeat:no-repeat;background-size:cover}#nav{padding:30px}#nav a{font-weight:700;color:#2c3e50}#nav a.router-link-exact-active{color:#42b983}ol,ul{padding:0!important}

+ 0 - 1
dist/static/css/chunk-26d01dfa.9738d400.css

@@ -1 +0,0 @@
-.header[data-v-4179d326]{width:94%;height:7rem;position:relative;top:.5rem;left:3%;box-shadow:.16rem .1rem .1rem .1rem #9d9b9b;border-radius:1rem;padding:.4rem .7rem 0 1rem;background:#fff}.header_btn[data-v-4179d326]{border-radius:1rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-4179d326]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-4179d326]{position:relative;top:-1.3rem}.header_middle1[data-v-4179d326]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-4179d326]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-4179d326]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-4179d326],[data-v-4179d326] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-4179d326]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-4179d326]{font-size:.5rem;color:#f4882a}.bdy[data-v-4179d326]{width:94%;height:calc(100% - 18.7rem);overflow:auto;position:relative;top:1rem;left:3%}[data-v-4179d326] td{text-align:center;vertical-align:middle}table[data-v-4179d326]{border-collapse:collapse;width:100%;background:#fff;table-layout:fixed}th[data-v-4179d326]{font-size:.6rem;background:#66b1f4;color:#fff}td[data-v-4179d326]{font-size:.6rem;word-break:break-all}td[data-v-4179d326],th[data-v-4179d326]{vertical-align:middle;text-align:center;border:.1rem solid #ddd;padding:.02rem}.choose_item[data-v-4179d326]{background:#c8c8c8}.footer[data-v-4179d326]{display:flex;justify-content:space-around;width:100%;position:absolute;bottom:4.8rem}

+ 0 - 1
dist/static/css/chunk-2a30b7a1.9d525d58.css

@@ -1 +0,0 @@
-.header[data-v-315407ce]{display:flex;justify-content:space-between;align-items:center;border-bottom:1px solid #356070}.bdy[data-v-315407ce]{height:calc(100% - 5rem);display:flex;flex-wrap:wrap;overflow:auto}.bdy[data-v-315407ce]::-webkit-scrollbar{width:8px}.bdy[data-v-315407ce]::-webkit-scrollbar-track{background:linear-gradient(180deg,#f5f5f5,#002359)}.bdy[data-v-315407ce]::-webkit-scrollbar-thumb{background:linear-gradient(180deg,#a1a1a1,#3b4169);border-radius:5px;box-shadow:inset 0 0 6px rgba(0,0,0,.3)}.choose_item[data-v-315407ce]{border-radius:20px;background:#fff;color:#000}.choose_item[data-v-315407ce],.item[data-v-315407ce]{cursor:pointer;display:flex;align-items:center;padding:10px;margin:20px 0 20px 2.5%;width:30%;height:80px}.item[data-v-315407ce]{border:1px solid #797878;color:#797878;border-radius:20px}

+ 1 - 0
dist/static/css/chunk-2af58fa3.2688627c.css

@@ -0,0 +1 @@
+.header[data-v-3897ffbe]{width:94%;height:7rem;position:relative;top:.5rem;left:3%;box-shadow:.16rem .1rem .1rem .1rem #9d9b9b;border-radius:1rem;padding:.4rem .7rem 0 1rem;background:#fff}.header_btn[data-v-3897ffbe]{border-radius:1rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-3897ffbe]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-3897ffbe]{position:relative;top:-1.3rem}.header_middle1[data-v-3897ffbe]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-3897ffbe]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-3897ffbe]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-3897ffbe],[data-v-3897ffbe] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-3897ffbe]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-3897ffbe]{font-size:.5rem;color:#f4882a}.bdy[data-v-3897ffbe]{width:94%;height:calc(100% - 18.7rem);overflow:auto;position:relative;top:1rem;left:3%}[data-v-3897ffbe] td{text-align:center;vertical-align:middle}table[data-v-3897ffbe]{border-collapse:collapse;width:100%;background:#fff;table-layout:fixed}th[data-v-3897ffbe]{font-size:.6rem;background:#66b1f4;color:#fff}td[data-v-3897ffbe]{font-size:.6rem;word-break:break-all}td[data-v-3897ffbe],th[data-v-3897ffbe]{vertical-align:middle;text-align:center;border:.1rem solid #ddd;padding:.02rem}.choose_item[data-v-3897ffbe]{background:#c8c8c8}.footer[data-v-3897ffbe]{display:flex;justify-content:space-around;width:100%;position:absolute;bottom:4.8rem}

+ 1 - 0
dist/static/css/chunk-2d4fa2a4.0887c19c.css

@@ -0,0 +1 @@
+.header[data-v-0adc3296]{width:94%;height:7rem;position:relative;top:.5rem;left:3%;box-shadow:.16rem .1rem .1rem .1rem #9d9b9b;border-radius:1rem;padding:.4rem .7rem 0 1rem;background:#fff}.header_btn[data-v-0adc3296]{border-radius:1rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-0adc3296]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-0adc3296]{position:relative;top:-1.3rem}.header_middle1[data-v-0adc3296]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-0adc3296]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-0adc3296]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-0adc3296],[data-v-0adc3296] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-0adc3296]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-0adc3296]{font-size:.5rem;color:#f4882a}.bdy[data-v-0adc3296]{padding:1rem;position:relative;width:94%;top:3rem;height:14rem;border-radius:1rem;left:3%;box-shadow:.16rem .1rem .1rem .1rem #9d9b9b;background:#fff}.bdy_btn[data-v-0adc3296]{margin-top:3rem;display:flex;justify-content:center;align-items:center}[data-v-0adc3296] .ivu-select-selection{height:100%;border:none}[data-v-0adc3296] .ivu-select-input{height:3.4rem;font-size:1.5rem}

+ 0 - 1
dist/static/css/chunk-2f323a42.6a245573.css

@@ -1 +0,0 @@
-.header[data-v-0a9416be]{width:94%;height:7rem;position:relative;top:.5rem;left:3%;box-shadow:.16rem .1rem .1rem .1rem #9d9b9b;border-radius:1rem;padding:.4rem .7rem 0 1rem;background:#fff}.header_btn[data-v-0a9416be]{border-radius:1rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-0a9416be]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-0a9416be]{position:relative;top:-1.3rem}.header_middle1[data-v-0a9416be]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-0a9416be]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-0a9416be]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-0a9416be],[data-v-0a9416be] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-0a9416be]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-0a9416be]{font-size:.5rem;color:#f4882a}.bdy[data-v-0a9416be]{width:94%;height:calc(100% - 18.7rem);overflow:auto;position:relative;top:1rem;left:3%}[data-v-0a9416be] td{text-align:center;vertical-align:middle}table[data-v-0a9416be]{border-collapse:collapse;width:100%;background:#fff;table-layout:fixed}th[data-v-0a9416be]{font-size:.6rem;background:#66b1f4;color:#fff}td[data-v-0a9416be]{font-size:.6rem;word-break:break-all}td[data-v-0a9416be],th[data-v-0a9416be]{vertical-align:middle;text-align:center;border:.1rem solid #ddd;padding:.02rem}.choose_item[data-v-0a9416be]{background:#c8c8c8}.footer[data-v-0a9416be]{display:flex;justify-content:space-around;width:100%;position:absolute;bottom:4.8rem}

+ 1 - 0
dist/static/css/chunk-40011ee0.36ba9e66.css

@@ -0,0 +1 @@
+.header[data-v-7a5c3504]{width:94%;height:7rem;position:relative;top:.5rem;left:3%;box-shadow:.16rem .1rem .1rem .1rem #9d9b9b;border-radius:1rem;padding:.4rem .7rem 0 1rem;background:#fff}.header_btn[data-v-7a5c3504]{border-radius:1rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-7a5c3504]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-7a5c3504]{position:relative;top:-1.3rem}.header_middle1[data-v-7a5c3504]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-7a5c3504]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-7a5c3504]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-7a5c3504],[data-v-7a5c3504] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-7a5c3504]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-7a5c3504]{font-size:.5rem;color:#f4882a}.bdy[data-v-7a5c3504]{display:flex;flex-wrap:wrap;width:94%;position:relative;top:1.4rem;left:3%;height:24rem}.bdy .item[data-v-7a5c3504]{width:46%;margin:2%;text-align:center;height:45%;border-radius:1rem;background:#fff;box-shadow:.16rem .1rem .1rem .1rem #9d9b9b}.ft_by[data-v-7a5c3504]{position:relative;top:.5rem;font-size:1.4rem}

+ 1 - 0
dist/static/css/chunk-401bb844.a00abff9.css

@@ -0,0 +1 @@
+.header[data-v-63e75786]{width:94%;height:7rem;position:relative;top:.5rem;left:3%;box-shadow:.16rem .1rem .1rem .1rem #9d9b9b;border-radius:1rem;padding:.4rem .7rem 0 1rem;background:#fff}.header_btn[data-v-63e75786]{border-radius:1rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-63e75786]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-63e75786]{position:relative;top:-1.3rem}.header_middle1[data-v-63e75786]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-63e75786]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-63e75786]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-63e75786],[data-v-63e75786] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-63e75786]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-63e75786]{font-size:.5rem;color:#f4882a}.bdy[data-v-63e75786]{width:94%;height:calc(100% - 18.7rem);overflow:auto;position:relative;top:1rem;left:3%}[data-v-63e75786] td{text-align:center;vertical-align:middle}table[data-v-63e75786]{border-collapse:collapse;width:100%;background:#fff;table-layout:fixed}th[data-v-63e75786]{font-size:.6rem;background:#66b1f4;color:#fff}td[data-v-63e75786]{font-size:.6rem;word-break:break-all}td[data-v-63e75786],th[data-v-63e75786]{vertical-align:middle;text-align:center;border:.1rem solid #ddd;padding:.02rem}.choose_item[data-v-63e75786]{background:#c8c8c8}.footer[data-v-63e75786]{display:flex;justify-content:space-around;width:100%;position:absolute;bottom:4.8rem}

+ 0 - 1
dist/static/css/chunk-50d16776.27071a14.css

@@ -1 +0,0 @@
-.bc[data-v-4766f50d]{height:100%}.tabBar[data-v-4766f50d]{width:100%;color:#a8a2a2}.footer[data-v-4766f50d]{position:absolute;bottom:0;width:100%;z-index:1;background:#fff}.nav-link[data-v-4766f50d]{color:#595959}.h5[data-v-4766f50d]{margin-bottom:0;position:relative;top:.24rem}.nav[data-v-4766f50d]{--bs-nav-link-padding-x:0rem;--bs-nav-link-padding-y:0rem}.choose2[data-v-4766f50d],.choose[data-v-4766f50d]{color:#5499fe;font-size:.8rem!important}.choose2[data-v-4766f50d]{position:relative;top:1.55rem}.circle[data-v-4766f50d]{width:3rem;height:3rem;margin:0 auto;position:absolute}.choose_1[data-v-4766f50d],.choose_3[data-v-4766f50d]{border-radius:50%;background:#5499fe;top:-.3rem;left:50%;transform:translate(-50%,-50%);line-height:2.3;z-index:2}[data-v-4766f50d] .ivu-modal{top:35%}

+ 1 - 0
dist/static/css/chunk-6642ad0c.2aaca7ed.css

@@ -0,0 +1 @@
+.bc[data-v-5c9abcb0]{height:100%}.tabBar[data-v-5c9abcb0]{width:100%;color:#a8a2a2}.footer[data-v-5c9abcb0]{position:absolute;bottom:0;width:100%;z-index:1;background:#fff}.nav-link[data-v-5c9abcb0]{color:#595959}.h5[data-v-5c9abcb0]{margin-bottom:0;position:relative;top:.24rem}.nav[data-v-5c9abcb0]{--bs-nav-link-padding-x:0rem;--bs-nav-link-padding-y:0rem}.choose2[data-v-5c9abcb0],.choose[data-v-5c9abcb0]{color:#5499fe;font-size:.8rem!important}.choose2[data-v-5c9abcb0]{position:relative;top:1.55rem}.circle[data-v-5c9abcb0]{width:3rem;height:3rem;margin:0 auto;position:absolute}.choose_1[data-v-5c9abcb0],.choose_3[data-v-5c9abcb0]{border-radius:50%;background:#5499fe;top:-.3rem;left:50%;transform:translate(-50%,-50%);line-height:2.3;z-index:2}[data-v-5c9abcb0] .ivu-modal{top:35%}

+ 1 - 0
dist/static/css/chunk-6675a5ce.5fd3ff09.css

@@ -0,0 +1 @@
+.header[data-v-64ed7476]{width:94%;height:7rem;position:relative;top:.5rem;left:3%;box-shadow:.16rem .1rem .1rem .1rem #9d9b9b;border-radius:1rem;padding:.4rem .7rem 0 1rem;background:#fff}.header_btn[data-v-64ed7476]{border-radius:1rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-64ed7476]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-64ed7476]{position:relative;top:-1.3rem}.header_middle1[data-v-64ed7476]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-64ed7476]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-64ed7476]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-64ed7476],[data-v-64ed7476] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-64ed7476]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-64ed7476]{font-size:.5rem;color:#f4882a}.bdy[data-v-64ed7476]{width:94%;height:calc(100% - 18.7rem);overflow:auto;position:relative;top:1rem;left:3%}[data-v-64ed7476] td{text-align:center;vertical-align:middle}table[data-v-64ed7476]{border-collapse:collapse;width:100%;background:#fff;table-layout:fixed}th[data-v-64ed7476]{font-size:.6rem;background:#66b1f4;color:#fff}td[data-v-64ed7476]{font-size:.6rem;word-break:break-all}td[data-v-64ed7476],th[data-v-64ed7476]{vertical-align:middle;text-align:center;border:.1rem solid #ddd;padding:.02rem}.choose_item[data-v-64ed7476]{background:#c8c8c8}.footer[data-v-64ed7476]{display:flex;justify-content:space-around;width:100%;position:absolute;bottom:4.8rem}

+ 0 - 1
dist/static/css/chunk-6af21413.b25b4a01.css

@@ -1 +0,0 @@
-.header[data-v-682eb772]{width:94%;height:7rem;position:relative;top:.5rem;left:3%;box-shadow:.16rem .1rem .1rem .1rem #9d9b9b;border-radius:1rem;padding:.4rem .7rem 0 1rem;background:#fff}.header_btn[data-v-682eb772]{border-radius:1rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-682eb772]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-682eb772]{position:relative;top:-1.3rem}.header_middle1[data-v-682eb772]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-682eb772]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-682eb772]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-682eb772],[data-v-682eb772] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-682eb772]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-682eb772]{font-size:.5rem;color:#f4882a}.bdy[data-v-682eb772]{width:94%;height:calc(100% - 18.7rem);overflow:auto;position:relative;top:1rem;left:3%}[data-v-682eb772] td{text-align:center;vertical-align:middle}table[data-v-682eb772]{border-collapse:collapse;width:100%;background:#fff;table-layout:fixed}th[data-v-682eb772]{font-size:.6rem;background:#66b1f4;color:#fff}td[data-v-682eb772]{font-size:.6rem;word-break:break-all}td[data-v-682eb772],th[data-v-682eb772]{vertical-align:middle;text-align:center;border:.1rem solid #ddd;padding:.02rem}.choose_item[data-v-682eb772]{background:#c8c8c8}.footer[data-v-682eb772]{display:flex;justify-content:space-around;width:100%;position:absolute;bottom:4.8rem}

+ 1 - 0
dist/static/css/chunk-6c8c1f7c.48f8be4c.css

@@ -0,0 +1 @@
+.header[data-v-920b5462]{width:94%;height:7rem;position:relative;top:.5rem;left:3%;box-shadow:.16rem .1rem .1rem .1rem #9d9b9b;border-radius:1rem;padding:.4rem .7rem 0 1rem;background:#fff}.header_btn[data-v-920b5462]{border-radius:1rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-920b5462]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-920b5462]{position:relative;top:-1.3rem}.header_middle1[data-v-920b5462]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-920b5462]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-920b5462]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-920b5462],[data-v-920b5462] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-920b5462]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-920b5462]{font-size:.5rem;color:#f4882a}.bdy[data-v-920b5462]{width:94%;height:calc(100% - 18.7rem);overflow:auto;position:relative;top:1rem;left:3%}[data-v-920b5462] td{text-align:center;vertical-align:middle}table[data-v-920b5462]{border-collapse:collapse;width:100%;background:#fff;table-layout:fixed}th[data-v-920b5462]{font-size:.6rem;background:#66b1f4;color:#fff}td[data-v-920b5462]{font-size:.6rem;word-break:break-all}td[data-v-920b5462],th[data-v-920b5462]{vertical-align:middle;text-align:center;border:.1rem solid #ddd;padding:.02rem}.choose_item[data-v-920b5462]{background:#c8c8c8}.footer[data-v-920b5462]{display:flex;justify-content:space-around;width:100%;position:absolute;bottom:4.8rem}

+ 0 - 1
dist/static/css/chunk-75d70626.fd68e53a.css

@@ -1 +0,0 @@
-.content[data-v-72291b22]{height:calc(100% - 5rem);overflow:auto}.content .item[data-v-72291b22]{width:94%;position:relative;left:3%;margin:1.5rem 0;border-radius:1rem;background-color:#fff;box-shadow:.16rem .1rem .1rem .1rem #9d9b9b;font-size:.8rem;display:flex;flex-wrap:wrap}.content .item .add[data-v-72291b22]{bottom:-.5rem;left:-.5rem}.content .item .add[data-v-72291b22],.content .item .delete[data-v-72291b22]{position:absolute;width:1.5rem;height:1.5rem;display:flex;align-items:center;justify-content:center;font-size:1.3rem;border-radius:50%;box-shadow:.1rem .1rem .1rem 0 #777676;background:#fff}.content .item .delete[data-v-72291b22]{top:-.5rem;right:-.5rem}.content .item .unit[data-v-72291b22]{width:50%;padding:.5rem;display:flex;align-items:center}.content .item .unit label[data-v-72291b22]{width:30%;text-align:right}.footer_btn[data-v-72291b22]{display:flex;justify-content:space-between;align-items:center}.boo[data-v-72291b22]{font-size:2rem;border-radius:50%;width:2rem;height:2rem;display:flex;align-items:center;justify-content:center;margin:.5rem;border:.1rem solid}

+ 0 - 1
dist/static/css/chunk-7e9e957b.ef8a19f1.css

@@ -1 +0,0 @@
-.header[data-v-9b402ffe]{width:94%;height:7rem;position:relative;top:.5rem;left:3%;box-shadow:.16rem .1rem .1rem .1rem #9d9b9b;border-radius:1rem;padding:.4rem .7rem 0 1rem;background:#fff}.header_btn[data-v-9b402ffe]{border-radius:1rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-9b402ffe]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-9b402ffe]{position:relative;top:-1.3rem}.header_middle1[data-v-9b402ffe]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-9b402ffe]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-9b402ffe]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-9b402ffe],[data-v-9b402ffe] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-9b402ffe]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-9b402ffe]{font-size:.5rem;color:#f4882a}.bdy[data-v-9b402ffe]{display:flex;flex-wrap:wrap;width:94%;position:relative;top:1.4rem;left:3%;height:24rem}.bdy .item[data-v-9b402ffe]{width:46%;margin:2%;text-align:center;height:45%;border-radius:1rem;background:#fff;box-shadow:.16rem .1rem .1rem .1rem #9d9b9b}.ft_by[data-v-9b402ffe]{position:relative;top:.5rem;font-size:1.4rem}

+ 1 - 0
dist/static/css/chunk-8d7034fa.aac27aa2.css

@@ -0,0 +1 @@
+.content[data-v-ff7c39fa]{height:calc(100% - 5rem);overflow:auto}.content .item[data-v-ff7c39fa]{width:94%;position:relative;left:3%;margin:1.5rem 0;border-radius:1rem;background-color:#fff;box-shadow:.16rem .1rem .1rem .1rem #9d9b9b;font-size:.8rem;display:flex;flex-wrap:wrap}.content .item .add[data-v-ff7c39fa]{bottom:-.5rem;left:-.5rem}.content .item .add[data-v-ff7c39fa],.content .item .delete[data-v-ff7c39fa]{position:absolute;width:1.5rem;height:1.5rem;display:flex;align-items:center;justify-content:center;font-size:1.3rem;border-radius:50%;box-shadow:.1rem .1rem .1rem 0 #777676;background:#fff}.content .item .delete[data-v-ff7c39fa]{top:-.5rem;right:-.5rem}.content .item .unit[data-v-ff7c39fa]{width:50%;padding:.5rem;display:flex;align-items:center}.content .item .unit label[data-v-ff7c39fa]{width:30%;text-align:right}.footer_btn[data-v-ff7c39fa]{display:flex;justify-content:space-between;align-items:center}.boo[data-v-ff7c39fa]{font-size:2rem;border-radius:50%;width:2rem;height:2rem;display:flex;align-items:center;justify-content:center;margin:.5rem;border:.1rem solid}

+ 1 - 0
dist/static/css/chunk-e5911432.cd72123a.css

@@ -0,0 +1 @@
+.header[data-v-1887477a]{display:flex;justify-content:space-between;align-items:center;border-bottom:1px solid #356070}.bdy[data-v-1887477a]{height:calc(100% - 5rem);display:flex;flex-wrap:wrap;overflow:auto}.bdy[data-v-1887477a]::-webkit-scrollbar{width:8px}.bdy[data-v-1887477a]::-webkit-scrollbar-track{background:linear-gradient(180deg,#f5f5f5,#002359)}.bdy[data-v-1887477a]::-webkit-scrollbar-thumb{background:linear-gradient(180deg,#a1a1a1,#3b4169);border-radius:5px;box-shadow:inset 0 0 6px rgba(0,0,0,.3)}.choose_item[data-v-1887477a]{border-radius:20px;background:#fff;color:#000}.choose_item[data-v-1887477a],.item[data-v-1887477a]{cursor:pointer;display:flex;align-items:center;padding:10px;margin:20px 0 20px 2.5%;width:30%;height:80px}.item[data-v-1887477a]{border:1px solid #797878;color:#797878;border-radius:20px}

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/app.30ec42fb.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/app.375097db.js


+ 0 - 0
dist/static/js/chunk-03f11e0c.14245d23.js → dist/static/js/chunk-03f11e0c.dd92df7b.js


+ 0 - 0
dist/static/js/chunk-05cd0a2c.6f3a29f3.js → dist/static/js/chunk-05cd0a2c.b8a12fb5.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-2af58fa3.de9a5d7e.js


+ 0 - 1
dist/static/js/chunk-2d21022e.6ceaa6de.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d21022e"],{b736:function(e,n,l){"use strict";l.r(n);var o=function(){var e=this,n=e._self._c;return n("div")},t=[],u={beforeRouteEnter(e,n,l){console.log(n),l(e=>{e.$router.replace(n.fullPath)})}},r=u,c=l("2877"),s=Object(c["a"])(r,o,t,!1,null,null,null);n["default"]=s.exports}}]);

+ 1 - 0
dist/static/js/chunk-2d21022e.aaaf816e.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d21022e"],{b736:function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e._self._c;return n("div")},r=[],l={beforeRouteEnter(e,n,t){t(e=>{e.$router.replace(n.fullPath)})}},o=l,c=t("2877"),a=Object(c["a"])(o,u,r,!1,null,null,null);n["default"]=a.exports}}]);

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-2d4fa2a4.79ff2e95.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-2f323a42.2e04f312.js


+ 0 - 0
dist/static/js/chunk-3b2bb27f.98d61203.js → dist/static/js/chunk-3b2bb27f.7bcb804d.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-40011ee0.1cafd732.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-401bb844.93f01109.js


+ 0 - 0
dist/static/js/chunk-430782b8.933eda2d.js → dist/static/js/chunk-430782b8.89066aed.js


+ 0 - 0
dist/static/js/chunk-59d32064.01c80e5b.js → dist/static/js/chunk-59d32064.03139606.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-6642ad0c.fdb16169.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-6675a5ce.c2775cf9.js


+ 0 - 0
dist/static/js/chunk-698e9c2a.52606d97.js → dist/static/js/chunk-698e9c2a.468eafac.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-6af21413.7f8e5a11.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-6c8c1f7c.5dd0e020.js


+ 0 - 0
dist/static/js/chunk-6e4aceda.52d636cb.js → dist/static/js/chunk-6e4aceda.cb3235a5.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-7e9e957b.5779aaa9.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/chunk-8d7034fa.6f437a46.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
dist/static/js/chunk-e5911432.5a87eeca.js


+ 4 - 3
src/main.js

@@ -8,13 +8,14 @@ import { BootstrapVue, IconsPlugin } from 'bootstrap-vue'
 import ViewUI from 'view-design';
 import 'view-design/dist/styles/iview.css';
 Vue.use(ViewUI);
+import untilFn from "../utils/util";
 // app.js
 import 'bootstrap/dist/css/bootstrap.css'
 import 'bootstrap-vue/dist/bootstrap-vue.css'
 // Install BootstrapVue
-import VueQrcodeReader from "vue-qrcode-reader";
-Vue.use(VueQrcodeReader);
-
+import VueQrcodeReader from "vue-qrcode-reader"
+Vue.use(VueQrcodeReader)
+Vue.prototype.func = untilFn //全局引入自定义函数库
 Vue.use(BootstrapVue)
 // Optionally install the BootstrapVue icon components plugin
 Vue.use(IconsPlugin)

+ 18 - 0
src/routerMap/index.js

@@ -63,6 +63,15 @@ const routerMap = [
     component: (resolve) => require(["@/views/page/Finish/detailed"], resolve),
   },
   {
+    path: "/cms/Package/index",
+    name: "PackageIndex", //包装
+    meta: {
+      index: 3,
+
+    },
+    component: (resolve) => require(["@/views/page/Package/index"], resolve),
+  },
+  {
     path: "/cms/Package/detail",
     name: "PackageDetail", //包装列表
     meta: {
@@ -108,6 +117,15 @@ const routerMap = [
     component: (resolve) => require(["@/views/page/Inventory/detail"], resolve),
   },
   {
+    path: "/cms/inventory/index",
+    name: "inventoryIndex", //盘点单
+    meta: {
+      index: 3,
+
+    },
+    component: (resolve) => require(["@/views/page/Inventory/index"], resolve),
+  },
+  {
     path: "/cms/ceshi",
     name: "ceshi", //完工详情
     meta: {

+ 6 - 4
src/views/cms.vue

@@ -259,16 +259,18 @@ export default {
         this.target.push(JSON.stringify(e));
       }
     },
-    handleGO() {
-      if (this.$route.fullPath.indexOf('/cms/finish/detail') != -1) {
+    handleGO () {
+      const url = ['/cms/finish/detail', '/cms/dispatch/detail', '/cms/Inventory/detail']
+      if (url.indexOf(this.$route.path) !== -1) {
         this.qrState = !this.qrState;
         if (this.qrState) {
           androidJs.startInventory();
         } else {
           androidJs.stopInventory();
           this.is_show = false;
-          localStorage.setItem('fyy_target', JSON.stringify(this.target));
-          this.$router.replace('/cms/refresh');
+          localStorage.setItem('fyy_target', JSON.stringify(this.target))
+          this.target = []
+          this.$router.replace('/cms/refresh')
         }
       }
     },

+ 35 - 9
src/views/page/Dispatch/detail.vue

@@ -133,20 +133,46 @@ export default {
             this.is_box_data.push(this.deelUniqueKey(element));
           }
         })
+        // let ji = ['\"425A3030303235\"']
+        // console.log(JSON.stringify(ji))
+        let text = []
+        if (localStorage.getItem('fyy_target')) {
+          // console.log(JSON.parse(localStorage.getItem('fyy_target')))
+          let target = JSON.parse(localStorage.getItem('fyy_target'))
+          localStorage.removeItem('fyy_target')
+          // this.$Message.warning(localStorage.getItem('fyy_target'))
+          target.forEach(v => {
+            v = v.replace(/\"/g, '')
+            text.push(this.func.hexToString(v))
+          })
+          // console.log(text)
+        }
         const dataBox = {
           url: 'http://121.36.142.167:7774/jbl/api/module-data/box_orders/box_orders/diy/defective_order_no_list',
-          post: { "defective_order_no_list":["BZ00025"]}
+          post: { "defective_order_no_list":text}
         }
-        this.initDataBox(dataBox)})
+        this.initDataBox(dataBox)
+      })
     },
     // 扫描数据获取
     initDataBox (row) {
+      this.$Message.warning(row.post["defective_order_no_list"].toString())
       this.axios.post('/api/testdwy', { ...row }).then(res => {
-        res.data.data.forEach((element, index) => {
-          let object = {"order_item_id":element.order_item_id,"order_no":element.order_no,"box_num":element.box_num,"product_no":element.product_no,"box_no":element.box_orders.defective_order_no,"box_id":element.box_orders.id};
-          this.scan_data.push(object)
-        })
-        this.deelTableData();
+        if (res.code == 200) {
+          this.$Message.success('请求成功!')
+          res.data.data.forEach((element, index) => {
+            let object = {
+              "order_item_id": element.order_item_id,
+              "order_no": element.order_no,
+              "box_num": element.box_num,
+              "product_no": element.product_no,
+              "box_no": element.box_orders.defective_order_no,
+              "box_id": element.box_orders.id
+            }
+            this.scan_data.push(object)
+          })
+          this.deelTableData();
+        }
       })
     },
     deelUniqueKey(element){
@@ -176,7 +202,7 @@ export default {
       this.tableData = new_table_data;
     },
     handelGoSure () {
-      console.log(this.tableData)
+
       this.tableData.forEach((element, index) => {
         element.item_num = (index + 1)
       })
@@ -203,7 +229,7 @@ export default {
     },
     handleShow () {
       this.is_show = !this.is_show
-      console.log(document.getElementsByClassName('header'))
+      // console.log(document.getElementsByClassName('header'))
       if (this.is_show) {
         document.getElementsByClassName('header')[0].style = 'height:7rem;overflow:hidden;transition:all .4s;'
         setTimeout(() => {

+ 13 - 5
src/views/page/Finish/detail.vue

@@ -96,13 +96,21 @@ export default {
       is_use: false
     }
   },
+  created () {
+  },
   mounted () {
-    // if (localStorage.getItem('fyy_target')) {
-    //   data.target = JSON.parse(localStorage.getItem('fyy_target'))
-    // }
+    let text = []
+    if (localStorage.getItem('fyy_target')) {
+      let target = JSON.parse(localStorage.getItem('fyy_target'))
+      localStorage.removeItem('fyy_target')
+      target.forEach(v => {
+        v = v.replace(/\"/g, '')
+        text.push(this.func.hexToString(v))
+      })
+    }
     this.tableData = []
-    const fyyTarget = ('PG2023081000025,PG2023081000024').split(',')
-    fyyTarget.forEach(v => {
+    // const fyyTarget = ('PG2023081000025,PG2023081000024').split(',')
+    text.forEach(v => {
       const data = {
         url: 'http://121.36.142.167:7774/jbl/api/module-data/dispatch_orders/page',
         post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[{"field":"dispatch_orders.dispatch_no","option":"LIKE_ANYWHERE","values":[v]},{"field":"product_no","option":"LIKE_ANYWHERE","values":["BC030101000001"]}],"size":15,"specialConditions":[],"workflowSearchBean":{},"dynamicFormCode":"dispatch_orders","dynamicFormTable":null,"ignoreField":true,"developmentSystemId":null,"debugFlag":true}

+ 54 - 54
src/views/page/Finish/detailed.vue

@@ -325,7 +325,7 @@ export default {
     // },
     handleSure () {
       // console.log(this.list);return false;
-      this.list.forEach(v => {
+      this.list.forEach((v,index) => {
         const data3 = {
           url: 'http://121.36.142.167:7774/jbl/api/module-data/completion_orders/completion_orders',
           post: {
@@ -356,65 +356,65 @@ export default {
             }
           }
         }
-        // this.axios.post('/api/testdwy', { ...data3 }).then(res => {
-        // if (res.code == 200) {
-        // this.$Message.success(res.msg)
-        // // this.$router.push('/cms/home')
-        // }
-        // })
-
-        const data4Dtil = [];
-        v.break.forEach(vv =>{
-          if(vv.break_id&&vv.break_num){
-            v.defective_num = vv.break_num;
-            v.defective_remark = vv.break_id;
-            data4Dtil.push(v) ;
+        const data4Dtil = []
+        v.break.forEach(vv => {
+          if (vv.break_id && vv.break_num) {
+            v.defective_num = vv.break_num
+            v.defective_remark = vv.break_id
+            data4Dtil.push(v)
           }
-
-
         })
-        if(data4Dtil.length > 0){
-          const data4 = {
-            url: 'http://121.36.142.167:7774/jbl/api/module-data/defective_orders/defective_orders',
-            post: {
-              bizId: -1,
-              bizTypeEk: 'LOWCODE',
-              dynamicFormId: "474139280406949888",
-              showModelId: "474140935059877888",
-              data: {
-                defective_orders: {
-                  defective_order_no: null,
-                  defection_time: new Date(),
-                  created_by: null,
-                  created_date: null,
-                  employee_id: v.employee_id.toString(),
-                  employee_id_show: v.employee_id_show,
-                  equipment_id: v.equipment_id,
-                  equipment_id_show: v.equipment_id_show,
-                  last_modified_by: null,
-                  last_modified_date: null,
-                  process_id: v.dispatch_orders.process_id,
-                  process_id_show: v.dispatch_orders.process_id_show,
-                  site: null,
-                  team_id: v.team_finish_id,
-                  team_id_show: v.team_id_show,
-                },
-                defective_orders_dtl: data4Dtil
+        this.axios.post('/api/testdwy', { ...data3 }).then(res => {
+          if (res.code === 200) {
+            if (data4Dtil.length > 0) {
+              const data4 = {
+                url: 'http://121.36.142.167:7774/jbl/api/module-data/defective_orders/defective_orders',
+                post: {
+                  bizId: -1,
+                  bizTypeEk: 'LOWCODE',
+                  dynamicFormId: "474139280406949888",
+                  showModelId: "474140935059877888",
+                  data: {
+                    defective_orders: {
+                      defective_order_no: null,
+                      defection_time: new Date(),
+                      created_by: null,
+                      created_date: null,
+                      employee_id: v.employee_id.toString(),
+                      employee_id_show: v.employee_id_show,
+                      equipment_id: v.equipment_id,
+                      equipment_id_show: v.equipment_id_show,
+                      last_modified_by: null,
+                      last_modified_date: null,
+                      process_id: v.dispatch_orders.process_id,
+                      process_id_show: v.dispatch_orders.process_id_show,
+                      site: null,
+                      team_id: v.team_finish_id,
+                      team_id_show: v.team_id_show
+                    },
+                    defective_orders_dtl: data4Dtil
+                  }
+                }
+
+              }
+              this.axios.post('/api/testdwy', { ...data4 }).then(req => {
+                if (req.code == 200) {
+                  if (index == this.list.length-1) {
+                    this.$Message.success(req.msg)
+                    this.$router.push('/cms/home')
+                  }
+                }
+              })
+            } else {
+              if(index==this.list.length-1){
+                this.$Message.success(res.msg)
+                this.$router.push('/cms/home')
               }
             }
-
           }
-          console.log(JSON.stringify(data4));return false;
-          //   this.axios.post('/api/testdwy', { ...data3 }).then(res => {
-          //     if (res.code == 200) {
-          //     // this.$Message.success(res.msg)
-          //
-          //
-          //   }
-          // })
-        }
-
+        })
     })
+
   }
 }}
 </script>

+ 7 - 4
src/views/page/Home.vue

@@ -81,7 +81,7 @@
         </svg>
         <div class="ft_by">发货</div>
       </div>
-      <!-- <div class="item">
+       <div class="item" @click="handleInventory">
         <svg
           t="1688030140909"
           class="icon"
@@ -98,8 +98,8 @@
             p-id="12366"
           ></path>
         </svg>
-        <div class="ft_by">返工</div>
-      </div> -->
+        <div class="ft_by">盘点</div>
+      </div>
       <div class="item" @click="handlePackage">
         <svg
           t="1688182715452"
@@ -141,11 +141,14 @@ export default {
     console.log(123)
   },
   methods: {
+    handleInventory () {
+      this.$router.push('/cms/inventory/index')
+    },
     handleFinish () {
       this.$router.push('/cms/finish/detail')
     },
     handlePackage () {
-      this.$router.push('/cms/Package/detail')
+      this.$router.push('/cms/Package/index')
     },
     handleDispatch () {
       this.$router.push('/cms/finish')

+ 15 - 3
src/views/page/Inventory/detail.vue

@@ -128,10 +128,21 @@ export default {
         this.intentory_name = res.data.data.goods_check.check_employee_id_show;
         this.data = res.data
         this.tableData.push(...res.data.data.goods_check_product);
-
+        let text = []
+        if (localStorage.getItem('fyy_target')) {
+          // console.log(JSON.parse(localStorage.getItem('fyy_target')))
+          let target = JSON.parse(localStorage.getItem('fyy_target'))
+          localStorage.removeItem('fyy_target')
+          // this.$Message.warning(localStorage.getItem('fyy_target'))
+          target.forEach(v => {
+            v = v.replace(/\"/g, '')
+            text.push(this.func.hexToString(v))
+          })
+          // console.log(text)
+        }
         const dataBox = {
           url: 'http://121.36.142.167:7774/jbl/api/module-data/box_orders/box_orders/diy/defective_order_no_list',
-          post: { "defective_order_no_list":["BZ00025"]}
+          post: { "defective_order_no_list":text}
         }
         this.initDataBox(dataBox)
         this.deelTableData();
@@ -140,6 +151,7 @@ export default {
     },
     // 扫描数据获取
     initDataBox (row) {
+      this.$Message.warning(row.post["defective_order_no_list"].toString())
       this.axios.post('/api/testdwy', { ...row }).then(res => {
         res.data.data.forEach((element, index) => {
 
@@ -161,7 +173,7 @@ export default {
     deelTableData () {
       this.tableData.forEach((element, index) => {
         if(Object.keys(this.key_tableData).indexOf(this.deelUniqueKey(element)) !== -1){
-            element.check_num = this.key_tableData[this.deelUniqueKey(element)];
+          element.check_num = this.key_tableData[this.deelUniqueKey(element)];
         }
       })
     },

+ 232 - 0
src/views/page/Inventory/index.vue

@@ -0,0 +1,232 @@
+<template>
+  <div>
+    <div class="header">
+      <div class="header_top">
+        <Button
+          type="primary"
+          class="header_btn"
+          ghost
+          @click="handleShow"
+          :icon="is_show ? 'ios-arrow-dropup' : 'ios-arrow-dropdown'"
+        >
+          <div style="margin-right: 0.6rem">
+            {{ is_show ? "收起" : "展开" }}
+          </div></Button
+        >
+        <div style="margin-right: 1rem; color: #66a9f0">王小伟</div>
+      </div>
+      <div class="header_middle">
+        <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
+          <b-dropdown-item-button>Action</b-dropdown-item-button>
+          <b-dropdown-item-button>Another action</b-dropdown-item-button>
+          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
+        </b-dropdown>
+        <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
+          <b-dropdown-item-button>Action</b-dropdown-item-button>
+          <b-dropdown-item-button>Another action</b-dropdown-item-button>
+          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
+        </b-dropdown>
+        <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
+          <b-dropdown-item-button>Action</b-dropdown-item-button>
+          <b-dropdown-item-button>Another action</b-dropdown-item-button>
+          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
+        </b-dropdown>
+      </div>
+      <div class="header_middle1 ot">
+        <div class="ft">58 &nbsp;</div>
+        <div class="ft">12 &nbsp;</div>
+        <div class="ft">12 &nbsp;</div>
+      </div>
+      <div class="header_footer">
+        <div style="margin-left: 1rem">已完成56/10</div>
+        <div style="margin-right: 1.4rem">已完成10%</div>
+      </div>
+    </div>
+    <div class="bdy">
+      <div style="font-size: 1.3rem; font-weight: bold">发货单号</div>
+      <div>
+        <Select
+          v-model="selected"
+          style="
+            margin-top: 1rem;
+            height: 3.4rem;
+            width: 100%;
+            font-size: 1.5rem;
+            border-radius: 0.6rem;
+            background: #fff;
+            border: 0.1rem solid;
+          "
+          filterable
+          clearable
+          placeholder="请选择"
+        >
+         <Option v-for="(item,index) in options" :key="index" :label="item.text" :value="item.value"/>
+        </Select>
+      </div>
+      <div class="bdy_btn">
+        <Button
+          type="primary"
+          class="header_btn"
+          style="margin-right: 3rem; height: 2.6rem"
+          @click="handleReturn"
+        >
+          返回</Button
+        >
+        <Button
+          type="primary"
+          class="header_btn"
+          style="margin-left: 3rem; height: 2.6rem"
+          @click="handelGoSure"
+        >
+          确认</Button
+        >
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      is_show: true,
+      is_use: false,
+      selected: '',
+      options: []
+    }
+  },
+  created () {
+    const data = {
+      url: 'http://121.36.142.167:7774/jbl/api/module-data/goods_check_list/page',
+      post:{"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"dynamicFormCode":"goods_check","developmentSystemId":null,"debugFlag":true}
+    }
+    this.axios.post('/api/testdwy', { ...data }).then(res => {
+      this.options = res.data.content.filter(v => v.status === "NOT_APPROVED")
+      this.options.forEach(v => {
+        v.value = v.dynamic_form_value_id
+        v.text = v.goods_check_no
+      })
+    })
+  },
+  methods: {
+    handelGoSure () {
+      if (!this.selected) {
+        return this.$Message.warning('请先选择盘点单号!')
+      }
+      this.$router.push({ path: '/cms/Inventory/detail', query: { id: this.selected } })
+    },
+    handleReturn () {
+      this.$router.push('/cms/home')
+    },
+    handleShow () {
+      this.is_show = !this.is_show
+      console.log(document.getElementsByClassName('header'))
+      if (this.is_show) {
+        document.getElementsByClassName('header')[0].style = 'height:7rem;overflow:hidden;transition:all .4s;'
+        setTimeout(() => {
+          document.getElementsByClassName('header')[0].style = 'overflow:none;'
+          this.is_use = false
+        }, 400)
+      } else {
+        this.is_use = true
+        document.getElementsByClassName('header')[0].style = 'height:2.7rem;overflow:hidden;transition:all .4s;'
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.header {
+  width: 94%;
+  height: 7rem;
+  // overflow: hidden;
+  // transition: all 0.4s;
+  position: relative;
+  top: 0.5rem;
+  left: 3%;
+  box-shadow: 0.16rem 0.1rem 0.1rem 0.1rem #9d9b9b;
+  border-radius: 1rem;
+  padding: 0.4rem 0.7rem 0 1rem;
+  background: #fff;
+}
+.header_btn {
+  border-radius: 1rem;
+  padding: 0.1rem;
+  width: 5rem;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+}
+.header_top {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.ot {
+  position: relative;
+  top: -1.3rem;
+}
+.header_middle1 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  .ft {
+    font-size: 1.5rem;
+    width: 5rem;
+    text-align: center;
+  }
+}
+.header_middle {
+  position: relative;
+  top: -0.3rem;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+/deep/ .btn-group > .btn,
+.btn-group-vertical > .btn {
+  background: #ffffff;
+  color: #2c3e50;
+  outline: none;
+  border: none;
+  margin: 0;
+  z-index: 3;
+}
+.header_footer {
+  position: relative;
+  top: -1.7rem;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  div {
+    font-size: 0.5rem;
+    color: rgb(244, 136, 42);
+  }
+}
+.bdy {
+  padding: 1rem;
+  position: relative;
+  width: 94%;
+
+  top: 3rem;
+  height: 14rem;
+  border-radius: 1rem;
+  left: 3%;
+  box-shadow: 0.16rem 0.1rem 0.1rem 0.1rem #9d9b9b;
+  background: #fff;
+}
+.bdy_btn {
+  margin-top: 3rem;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+/deep/ .ivu-select-selection{
+  height: 100%;
+  border:none;
+}
+/deep/.ivu-select-input{
+  height: 3.4rem;
+  font-size:1.5rem
+}
+</style>

+ 2 - 2
src/views/page/Package/detail.vue

@@ -108,7 +108,7 @@ export default {
 
     const data = {
       url: 'http://121.36.142.167:7774/jbl/api/module-data/sale_order/page',
-      post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[{"field":"exe_sale_order_b.no","option":"LIKE_ANYWHERE","values":["SO202308070001"]}],"size":15,"specialConditions":[],"workflowSearchBean":{},"dynamicFormCode":"sale_order","dynamicFormTable":null,"ignoreField":true,"developmentSystemId":null,"debugFlag":true}
+      post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[{"field":"exe_sale_order_b.no","option":"LIKE_ANYWHERE","values":[this.$route.query.id]}],"size":15,"specialConditions":[],"workflowSearchBean":{},"dynamicFormCode":"sale_order","dynamicFormTable":null,"ignoreField":true,"developmentSystemId":null,"debugFlag":true}
     }
     this.initData(data)
   },
@@ -137,7 +137,7 @@ export default {
     },
     handleReturn () {
       localStorage.removeItem('fyy_target')
-      this.$router.push('/cms/home')
+      this.$router.push('/cms/Package/index')
     },
     handleChoose (item, index) {
       item.is_choose = !item.is_choose

+ 232 - 0
src/views/page/Package/index.vue

@@ -0,0 +1,232 @@
+<template>
+  <div>
+    <div class="header">
+      <div class="header_top">
+        <Button
+          type="primary"
+          class="header_btn"
+          ghost
+          @click="handleShow"
+          :icon="is_show ? 'ios-arrow-dropup' : 'ios-arrow-dropdown'"
+        >
+          <div style="margin-right: 0.6rem">
+            {{ is_show ? "收起" : "展开" }}
+          </div></Button
+        >
+        <div style="margin-right: 1rem; color: #66a9f0">王小伟</div>
+      </div>
+      <div class="header_middle">
+        <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
+          <b-dropdown-item-button>Action</b-dropdown-item-button>
+          <b-dropdown-item-button>Another action</b-dropdown-item-button>
+          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
+        </b-dropdown>
+        <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
+          <b-dropdown-item-button>Action</b-dropdown-item-button>
+          <b-dropdown-item-button>Another action</b-dropdown-item-button>
+          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
+        </b-dropdown>
+        <b-dropdown size="sm" text="Large" class="m-2" :disabled="is_use">
+          <b-dropdown-item-button>Action</b-dropdown-item-button>
+          <b-dropdown-item-button>Another action</b-dropdown-item-button>
+          <b-dropdown-item-button>Something else here</b-dropdown-item-button>
+        </b-dropdown>
+      </div>
+      <div class="header_middle1 ot">
+        <div class="ft">58 &nbsp;</div>
+        <div class="ft">12 &nbsp;</div>
+        <div class="ft">12 &nbsp;</div>
+      </div>
+      <div class="header_footer">
+        <div style="margin-left: 1rem">已完成56/10</div>
+        <div style="margin-right: 1.4rem">已完成10%</div>
+      </div>
+    </div>
+    <div class="bdy">
+      <div style="font-size: 1.3rem; font-weight: bold">销售单号</div>
+      <div>
+        <Select
+          v-model="selected"
+          style="
+            margin-top: 1rem;
+            height: 3.4rem;
+            width: 100%;
+            font-size: 1.5rem;
+            border-radius: 0.6rem;
+            background: #fff;
+            border: 0.1rem solid;
+          "
+          filterable
+          clearable
+          placeholder="请选择"
+        >
+         <Option v-for="(item,index) in options" :key="index" :label="item.text" :value="item.value"/>
+        </Select>
+      </div>
+      <div class="bdy_btn">
+        <Button
+          type="primary"
+          class="header_btn"
+          style="margin-right: 3rem; height: 2.6rem"
+          @click="handleReturn"
+        >
+          返回</Button
+        >
+        <Button
+          type="primary"
+          class="header_btn"
+          style="margin-left: 3rem; height: 2.6rem"
+          @click="handelGoSure"
+        >
+          确认</Button
+        >
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      is_show: true,
+      is_use: false,
+      selected: '',
+      options: []
+    }
+  },
+  created () {
+    const data = {
+      url: 'http://121.36.142.167:7774/jbl/api/module-data/exe_sale_order_b/page',
+      post:{"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"dynamicFormCode":"exe_sale_order_b","developmentSystemId":null,"debugFlag":false}
+    }
+    this.axios.post('/api/testdwy', { ...data }).then(res => {
+      this.options = res.data.content
+      this.options.forEach(v => {
+        v.value = v.no
+        v.text = v.no
+      })
+    })
+  },
+  methods: {
+    handelGoSure () {
+      if (!this.selected) {
+        return this.$Message.warning('请先选择销售单号!')
+      }
+      this.$router.push({ path: '/cms/Package/detail', query: { id: this.selected } })
+    },
+    handleReturn () {
+      this.$router.push('/cms/home')
+    },
+    handleShow () {
+      this.is_show = !this.is_show
+      console.log(document.getElementsByClassName('header'))
+      if (this.is_show) {
+        document.getElementsByClassName('header')[0].style = 'height:7rem;overflow:hidden;transition:all .4s;'
+        setTimeout(() => {
+          document.getElementsByClassName('header')[0].style = 'overflow:none;'
+          this.is_use = false
+        }, 400)
+      } else {
+        this.is_use = true
+        document.getElementsByClassName('header')[0].style = 'height:2.7rem;overflow:hidden;transition:all .4s;'
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.header {
+  width: 94%;
+  height: 7rem;
+  // overflow: hidden;
+  // transition: all 0.4s;
+  position: relative;
+  top: 0.5rem;
+  left: 3%;
+  box-shadow: 0.16rem 0.1rem 0.1rem 0.1rem #9d9b9b;
+  border-radius: 1rem;
+  padding: 0.4rem 0.7rem 0 1rem;
+  background: #fff;
+}
+.header_btn {
+  border-radius: 1rem;
+  padding: 0.1rem;
+  width: 5rem;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+}
+.header_top {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.ot {
+  position: relative;
+  top: -1.3rem;
+}
+.header_middle1 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  .ft {
+    font-size: 1.5rem;
+    width: 5rem;
+    text-align: center;
+  }
+}
+.header_middle {
+  position: relative;
+  top: -0.3rem;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+/deep/ .btn-group > .btn,
+.btn-group-vertical > .btn {
+  background: #ffffff;
+  color: #2c3e50;
+  outline: none;
+  border: none;
+  margin: 0;
+  z-index: 3;
+}
+.header_footer {
+  position: relative;
+  top: -1.7rem;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  div {
+    font-size: 0.5rem;
+    color: rgb(244, 136, 42);
+  }
+}
+.bdy {
+  padding: 1rem;
+  position: relative;
+  width: 94%;
+
+  top: 3rem;
+  height: 14rem;
+  border-radius: 1rem;
+  left: 3%;
+  box-shadow: 0.16rem 0.1rem 0.1rem 0.1rem #9d9b9b;
+  background: #fff;
+}
+.bdy_btn {
+  margin-top: 3rem;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+/deep/ .ivu-select-selection{
+  height: 100%;
+  border:none;
+}
+/deep/.ivu-select-input{
+  height: 3.4rem;
+  font-size:1.5rem
+}
+</style>

+ 5 - 2
src/views/page/print.vue

@@ -50,12 +50,15 @@ export default {
       }
       let arr = [{ PTK_OpenUSBPort: 255 }, { PTK_ClearBuffer: "" }, { PTK_SetDarkness: 10 }, { PTK_SetPrintSpeed: 4 }, { PTK_SetDirection: "B" }, { PTK_SetLabelHeight: "204,24,0,false" }, { PTK_SetLabelWidth: 800 }]
       this.selectData.forEach(v => {
-        v.chip = v.dispatch_no
+        let cont = (this.func.stringToHex(v.dispatch_no).length)%4;
+        v.chip = this.func.stringToHex(v.dispatch_no)
+        for(let i = 0;i<cont;i++){
+          v.chip = '0'+ v.chip
+        }
         let obj = [{ PTK_DrawText_TrueType: "0,25,45,0,微软雅黑,1,700,0,0,0,派工单号:" }, { PTK_DrawText_TrueType: "150,25,45,0,微软雅黑,1,700,0,0,0,"+v.dispatch_no }, { PTK_RWRFIDLabel: `1,0,0,${v.chip.length / 2},1,${v.chip}` }, { PTK_PrintLabel: "1,1" }]
         arr.push(...obj)
       })
       arr.push({ PTK_CloseUSBPort: "" })
-      console.log(arr)
       let _this = this
       let printparams = JSON.stringify(arr)
       $.ajax({

+ 2 - 3
src/views/page/refresh.vue

@@ -3,12 +3,11 @@
 </template>
 <script>
 export default {
-  beforeRouteEnter(to, from, next) {
-    console.log(from);
+  beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.$router.replace(from.fullPath)
       // 跳到该路由页面后,再替换为from.path来源路径
     })
   }
 }
-</script>
+</script>

+ 20 - 0
utils/util.js

@@ -0,0 +1,20 @@
+export default {
+  stringToHex (str) {
+    // 将字符串转换为UTF-8编码的字节数组
+    var byteArray = new TextEncoder().encode(str);
+    // 将字节数组转换为16进制字符串
+    var hexString = Array.prototype.map.call(byteArray, function(byte) {
+      return ('0' + byte.toString(16)).slice(-2)
+    }).join('')
+    return hexString
+  },
+  hexToString (hexString) {
+    // 将16进制字符串转换为字节数组
+    var byteArray = hexString.match(/.{1,2}/g).map(function (byteStr) {
+      return parseInt(byteStr, 16)
+    })
+    // 将字节数组转换为字符串
+    var str = new TextDecoder().decode(new Uint8Array(byteArray))
+    return str
+  }
+}

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels