mushencc hai 1 ano
pai
achega
4efc4e3685
Modificáronse 60 ficheiros con 422 adicións e 242 borrados
  1. 0 0
      dist/index.html
  2. 0 1
      dist/static/css/app.2b1659bd.css
  3. 1 0
      dist/static/css/app.72122810.css
  4. 1 0
      dist/static/css/chunk-05cd0a2c.cfa128bf.css
  5. 0 1
      dist/static/css/chunk-089685f8.376a7d63.css
  6. 0 1
      dist/static/css/chunk-0dead9c5.7bb64dd9.css
  7. 0 1
      dist/static/css/chunk-1f1f83a4.31a091cf.css
  8. 1 0
      dist/static/css/chunk-26d01dfa.9738d400.css
  9. 1 0
      dist/static/css/chunk-2a30b7a1.9d525d58.css
  10. 1 0
      dist/static/css/chunk-2f323a42.6a245573.css
  11. 1 0
      dist/static/css/chunk-430782b8.9dc125cf.css
  12. 1 0
      dist/static/css/chunk-50d16776.27071a14.css
  13. 1 0
      dist/static/css/chunk-59d32064.d6fa6cf3.css
  14. 1 0
      dist/static/css/chunk-698e9c2a.6400458c.css
  15. 1 0
      dist/static/css/chunk-6af21413.b25b4a01.css
  16. 0 1
      dist/static/css/chunk-743db3e8.25aa2ded.css
  17. 1 0
      dist/static/css/chunk-75d70626.fd68e53a.css
  18. 1 0
      dist/static/css/chunk-7e9e957b.ef8a19f1.css
  19. 0 1
      dist/static/css/chunk-939b5872.cc2bacf7.css
  20. 0 1
      dist/static/css/chunk-f965fc8a.4f90b281.css
  21. BIN=BIN
      dist/static/img/bc.ffc3491e.png
  22. BIN=BIN
      dist/static/img/btn_login.a8f1c793.png
  23. BIN=BIN
      dist/static/img/home_title.9a7ca220.png
  24. 0 0
      dist/static/js/app.30ec42fb.js
  25. 0 0
      dist/static/js/app.47cc5f40.js
  26. 0 0
      dist/static/js/chunk-05cd0a2c.6f3a29f3.js
  27. 0 0
      dist/static/js/chunk-089685f8.1db316f2.js
  28. 0 0
      dist/static/js/chunk-0dead9c5.d656568a.js
  29. 0 0
      dist/static/js/chunk-1f1f83a4.033dbbf2.js
  30. 0 0
      dist/static/js/chunk-26d01dfa.0e1ce1f5.js
  31. 1 1
      dist/static/js/chunk-2a30b7a1.738889e3.js
  32. 0 0
      dist/static/js/chunk-2f323a42.2e04f312.js
  33. 0 0
      dist/static/js/chunk-430782b8.933eda2d.js
  34. 0 0
      dist/static/js/chunk-50d16776.471d9ffb.js
  35. 0 0
      dist/static/js/chunk-59d32064.01c80e5b.js
  36. 0 0
      dist/static/js/chunk-698e9c2a.52606d97.js
  37. 0 0
      dist/static/js/chunk-6af21413.7f8e5a11.js
  38. 0 0
      dist/static/js/chunk-743db3e8.869e4e0f.js
  39. 0 0
      dist/static/js/chunk-75d70626.f21b3c66.js
  40. 0 0
      dist/static/js/chunk-7e9e957b.5779aaa9.js
  41. 0 0
      dist/static/js/chunk-f965fc8a.86b38e99.js
  42. 0 0
      dist/static/js/chunk-vendors.f48c7092.js
  43. 10 4
      public/index.html
  44. 29 3
      src/App.vue
  45. BIN=BIN
      src/assets/images/bc.png
  46. BIN=BIN
      src/assets/images/btn_login.png
  47. BIN=BIN
      src/assets/images/home_title.png
  48. 6 1
      src/router/index.js
  49. 1 1
      src/routerMap/index.js
  50. 54 45
      src/views/Login.vue
  51. 5 4
      src/views/cms.vue
  52. 115 127
      src/views/page/Dispatch/detail.vue
  53. 1 2
      src/views/page/Finish/detail.vue
  54. 6 12
      src/views/page/Finish/detailed.vue
  55. 22 17
      src/views/page/Finish/index.vue
  56. 1 1
      src/views/page/Home.vue
  57. 1 2
      src/views/page/Package/detail.vue
  58. 17 15
      src/views/page/Package/detailed.vue
  59. 131 0
      src/views/page/print.vue
  60. 10 0
      vue.config.js

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/index.html


+ 0 - 1
dist/static/css/app.2b1659bd.css

@@ -1 +0,0 @@
-#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#2c3e50;overflow-x:hidden}#nav{padding:30px}#nav a{font-weight:700;color:#2c3e50}#nav a.router-link-exact-active{color:#42b983}

+ 1 - 0
dist/static/css/app.72122810.css

@@ -0,0 +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}

+ 1 - 0
dist/static/css/chunk-05cd0a2c.cfa128bf.css

@@ -0,0 +1 @@
+.content[data-v-6e02f900]{height:calc(100% - 5rem);overflow:auto}.content .item[data-v-6e02f900]{width:94%;height:auto;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-6e02f900]{bottom:-.5rem;left:-.5rem}.content .item .add[data-v-6e02f900],.content .item .delete[data-v-6e02f900]{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-6e02f900]{top:-.5rem;right:-.5rem}.content .item .unit[data-v-6e02f900]{width:50%;padding:.5rem;vertical-align:middle}.content .item .unit label[data-v-6e02f900]{width:40%;text-align:center}.footer_btn[data-v-6e02f900]{display:flex;justify-content:space-between;align-items:center}[data-v-6e02f900] .ivu-select-dropdown-list{padding:0!important}

+ 0 - 1
dist/static/css/chunk-089685f8.376a7d63.css

@@ -1 +0,0 @@
-.content[data-v-5e4050fa]{height:calc(100% - 10rem);overflow:auto}.content .item[data-v-5e4050fa]{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-5e4050fa]{bottom:-.5rem;left:-.5rem}.content .item .add[data-v-5e4050fa],.content .item .delete[data-v-5e4050fa]{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-5e4050fa]{top:-.5rem;right:-.5rem}.content .item .unit[data-v-5e4050fa]{width:50%;padding:.5rem;vertical-align:middle}.content .item .unit label[data-v-5e4050fa]{width:40%;text-align:center}.footer[data-v-5e4050fa]{position:absolute;bottom:7rem;height:3rem;width:100%;border-top:.2rem solid #8a8888}.footer_content[data-v-5e4050fa]{display:flex;flex-wrap:wrap;font-size:.8rem}.footer_content>div[data-v-5e4050fa]{width:50%;display:flex}.footer_content>div label[data-v-5e4050fa]{width:45%;text-align:center}.footer_content>div div[data-v-5e4050fa]{width:60%;text-align:center}.footer_btn[data-v-5e4050fa]{display:flex;justify-content:space-between;align-items:center}

+ 0 - 1
dist/static/css/chunk-0dead9c5.7bb64dd9.css

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

+ 0 - 1
dist/static/css/chunk-1f1f83a4.31a091cf.css

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

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

@@ -0,0 +1 @@
+.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}

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

@@ -0,0 +1 @@
+.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-2f323a42.6a245573.css

@@ -0,0 +1 @@
+.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-430782b8.9dc125cf.css

@@ -0,0 +1 @@
+.view[data-v-7bd692c6]{height:100%;padding:0;overflow-x:hidden}.form[data-v-7bd692c6]{box-sizing:border-box;width:100%;height:100%;position:absolute;top:8.8rem;padding:1.7rem 1.5rem;font-size:18px!important;font-weight:700}.logo[data-v-7bd692c6]{width:6rem;height:6rem;position:absolute;top:20%;left:50%;transform:translate(-50%,-70%)}.logo img[data-v-7bd692c6]{width:100%;height:100%}.header[data-v-7bd692c6]{color:#fff;font-size:1.5rem;position:relative;width:100%;top:3rem;left:1rem}[data-v-7bd692c6] .inp{background:#2a4470!important;opacity:.4;border:none}input[data-v-7bd692c6]{color:#fff}.inp[data-v-7bd692c6]:focus{background-color:#04ffd5;color:#fff;border:1px solid #76cfff}[data-v-7bd692c6] .col-2,[data-v-7bd692c6] .col-3{color:#fff;font-family:PingFangSC-Medium,sans-serif;text-shadow:1px 1px 1px #4fc9f2;letter-spacing:2px}.btn_login[data-v-7bd692c6]{background:url(../../static/img/btn_login.a8f1c793.png);display:flex;height:3.5rem;justify-content:center;align-items:center;background-repeat:no-repeat;background-size:cover}

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

@@ -0,0 +1 @@
+.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-59d32064.d6fa6cf3.css

@@ -0,0 +1 @@
+.content[data-v-3360b0f3]{height:calc(100% - 5rem);overflow:auto}.content .item[data-v-3360b0f3]{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-3360b0f3]{bottom:-.5rem;left:-.5rem}.content .item .add[data-v-3360b0f3],.content .item .delete[data-v-3360b0f3]{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-3360b0f3]{top:-.5rem;right:-.5rem}.content .item .unit[data-v-3360b0f3]{width:50%;padding:.5rem;vertical-align:middle}.content .item .unit label[data-v-3360b0f3]{width:40%;text-align:center}.footer_btn[data-v-3360b0f3]{display:flex;justify-content:space-between;align-items:center}[data-v-3360b0f3] .ivu-modal-content{top:-5rem}[data-v-3360b0f3] .ivu-form-item{margin-bottom:.5rem}

+ 1 - 0
dist/static/css/chunk-698e9c2a.6400458c.css

@@ -0,0 +1 @@
+.header[data-v-263b028d]{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-263b028d]{border-radius:1rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-263b028d]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-263b028d]{position:relative;top:-1.3rem}.header_middle1[data-v-263b028d]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-263b028d]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-263b028d]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-263b028d],[data-v-263b028d] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-263b028d]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-263b028d]{font-size:.5rem;color:#f4882a}.bdy[data-v-263b028d]{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-263b028d]{margin-top:3rem;display:flex;justify-content:center;align-items:center}[data-v-263b028d] .ivu-select-selection{height:100%;border:none}[data-v-263b028d] .ivu-select-input{height:3.4rem;font-size:1.5rem}

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

@@ -0,0 +1 @@
+.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}

+ 0 - 1
dist/static/css/chunk-743db3e8.25aa2ded.css

@@ -1 +0,0 @@
-.header[data-v-43c7ffed]{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-43c7ffed]{border-radius:1rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-43c7ffed]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-43c7ffed]{position:relative;top:-1.3rem}.header_middle1[data-v-43c7ffed]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-43c7ffed]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-43c7ffed]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-43c7ffed],[data-v-43c7ffed] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-43c7ffed]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-43c7ffed]{font-size:.5rem;color:#f4882a}.bdy[data-v-43c7ffed]{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-43c7ffed]{margin-top:3rem;display:flex;justify-content:center;align-items:center}

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

@@ -0,0 +1 @@
+.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}

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

@@ -0,0 +1 @@
+.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}

+ 0 - 1
dist/static/css/chunk-939b5872.cc2bacf7.css

@@ -1 +0,0 @@
-.view[data-v-5918b620]{height:100vh;width:100vw;background:#4d8ef7;padding:0;overflow-x:hidden}.form[data-v-5918b620]{box-sizing:border-box;width:100%;height:100%;position:absolute;top:8.8rem;padding:1.7rem 1.5rem;border-radius:1.5rem 1.5rem 0 0;font-size:18px!important;font-weight:700;background:#fff;transform:translateX(1px) scaleX(1.01)}.logo[data-v-5918b620]{width:6rem;height:6rem;position:absolute;top:20%;left:50%;transform:translate(-50%,-70%)}.logo img[data-v-5918b620]{width:100%;height:100%}.header[data-v-5918b620]{color:#fff;font-weight:700;font-family:Lucida Sans,Lucida Sans Regular,Lucida Grande,Lucida Sans Unicode,Geneva,Verdana,sans-serif;font-size:1.5rem;position:relative;width:100%;height:20%;top:3rem;left:2rem}.inp[data-v-5918b620]:focus{background:#fff!important}

+ 0 - 1
dist/static/css/chunk-f965fc8a.4f90b281.css

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

BIN=BIN
dist/static/img/bc.ffc3491e.png


BIN=BIN
dist/static/img/btn_login.a8f1c793.png


BIN=BIN
dist/static/img/home_title.9a7ca220.png


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.30ec42fb.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.47cc5f40.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-05cd0a2c.6f3a29f3.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-089685f8.1db316f2.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-0dead9c5.d656568a.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-1f1f83a4.033dbbf2.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-26d01dfa.0e1ce1f5.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
dist/static/js/chunk-2a30b7a1.738889e3.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-2f323a42.2e04f312.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-430782b8.933eda2d.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-50d16776.471d9ffb.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-59d32064.01c80e5b.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-698e9c2a.52606d97.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-6af21413.7f8e5a11.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-743db3e8.869e4e0f.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-75d70626.f21b3c66.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-7e9e957b.5779aaa9.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-f965fc8a.86b38e99.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-vendors.f48c7092.js


+ 10 - 4
public/index.html

@@ -4,13 +4,14 @@
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0,initial-scale=1.0,maximum-scale=1.0,user-scalable=no">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
   <title>
     <%= htmlWebpackPlugin.options.title %>
   </title>
 </head>
-
+<script>
+</script>
 <body>
   <noscript>
     <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
@@ -19,5 +20,10 @@
   <div id="app"></div>
   <!-- built files will be auto injected -->
 </body>
-
-</html>
+<style>
+    html,body{
+        overflow: hidden;
+        height: 100vh;
+    }
+</style>
+</html>

+ 29 - 3
src/App.vue

@@ -1,17 +1,43 @@
 <template>
   <div id="app">
-    <router-view />
+    <router-view class="content"/>
   </div>
 </template>
+<script>
+function getScrollTop(){
+  var scrollTop=0;
+  if(document.documentElement&&document.documentElement.scrollTop){
+    scrollTop=document.documentElement.scrollTop
+  }else if(document.body){
+    scrollTop=document.body.scrollTop
+  }
+  return scrollTop
+}
 
+var oldScrollTop = getScrollTop() || 0; // 记录当前滚动位置
+document.body.addEventListener('focusin', () => { // 软键盘弹起事件
+})
+document.body.addEventListener('focusout', () => { // 软键盘关闭事件
+  var ua = window.navigator.userAgent
+  if (ua.indexOf('iPhone') > 0 || ua.indexOf('iPad') > 0) { // 键盘收起页面空白问题
+    document.body.scrollTop = oldScrollTop
+    document.documentElement.scrollTop = oldScrollTop
+  }
+})
+</script>
 <style>
 #app {
   font-family: Avenir, Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  color: #2c3e50;
-  overflow-x: hidden;
+  color: #fff;
+  height: 100vh;
+  width: 100vw;
 }
+.content{
+  background-image: url("./assets/images/bc.png");
+  background-repeat: no-repeat ;
+  background-size: cover;}
 
 #nav {
   padding: 30px;

BIN=BIN
src/assets/images/bc.png


BIN=BIN
src/assets/images/btn_login.png


BIN=BIN
src/assets/images/home_title.png


+ 6 - 1
src/router/index.js

@@ -17,6 +17,11 @@ const routes = [
     component: resolve => require(['@/views/Login'], resolve)
   },
   {
+    path: "/cms/print",
+    name: "print", // 打印芯片
+    component: (resolve) => require(["@/views/page/print"], resolve)
+  },
+  {
     path: '/cms',
     name: 'Cms',
     meta: { index: 2 },
@@ -35,7 +40,7 @@ router.beforeEach((to, from, next) => {
     next()
   } else {
     const token = localStorage.getItem('token')
-    if (!token) {
+    if (!token&&to.path!=='/cms/print') {
       next('/')
     } else {
       next()

+ 1 - 1
src/routerMap/index.js

@@ -108,4 +108,4 @@ const routerMap = [
     component: (resolve) => require(["@/views/page/ceshi"], resolve),
   },
 ]
-export default routerMap;
+export default routerMap;

+ 54 - 45
src/views/Login.vue

@@ -4,13 +4,9 @@
       <img src="../assets/FG-01C.png" alt="" />
     </div> -->
     <div class="header">
-      <p>
-        你好!
-        <br />
-        欢迎使用扫码系统
-      </p>
+      <img src="../assets/images/home_title.png">
     </div>
-    <b-form @submit.prevent="onSubmit" class="form">
+    <b-form class="form">
       <b-form-group
         label="账号"
         label-for="input-1"
@@ -27,10 +23,6 @@
             font-size: 1.1rem;
             font-weight: 500;
             letter-spacing: 0.1rem;
-            background: #f2f2f2;
-            border-radius: 1.2rem;
-            border: none;
-            box-shadow: 0.2rem 0.18rem 0.1rem 0.1rem rgba(0, 0, 0, 0.3);
           "
           placeholder="请输入账号"
         ></b-form-input>
@@ -52,15 +44,13 @@
             height: 3rem;
             font-size: 1.1rem;
             font-weight: 500;
-            background: #f2f2f2;
-            border-radius: 1.2rem;
             letter-spacing: 0.1rem;
-            border: none;
-            box-shadow: 0.2rem 0.18rem 0.1rem 0.1rem rgba(0, 0, 0, 0.3);
+
           "
           required
           placeholder="请输入密码"
         ></b-form-input>
+      </b-form-group>
         <b-form-group
             label="所属站点"
             label-for="input-3"
@@ -77,29 +67,21 @@
              padding: 0 0 0 0.5rem;
             font-size: 1.1rem;
             font-weight: 500;
-            background: #f2f2f2;
-            border-radius: 1.2rem;
             letter-spacing: 0.1rem;
-            border: none;
-            box-shadow: 0.2rem 0.18rem 0.1rem 0.1rem rgba(0, 0, 0, 0.3);"
+           "
               required
               placeholder="请选择站点"
               @change="handleChangeSite"
           ></b-form-select>
-        </b-form-group>
       </b-form-group>
-      <b-button
-        type="submit"
-        variant="primary"
-        style="
+      <div @click="onSubmit" style="
           width: 100%;
-          height: 3rem;
-          font-size: 1.2rem;
-          border-radius: 1.2rem;
-          margin-top: 2rem;
+
+          margin-top: 3rem;
         "
-        >登录</b-button
+           class="btn_login"
       >
+        <span style="color: #ffffff;font-family: PingFangSC-Medium, sans-serif;text-shadow:1px 1px 1px #4FC9F2;letter-spacing: 2px;font-size: 1.2rem">登录</span></div>
     </b-form>
   </div>
 </template>
@@ -141,11 +123,15 @@ export default {
       }
       this.axios.post('/api/testdwy', data).then(res => {
         if (res.code === 200) {
-          this.$Message.success(res.msg)
-          localStorage.setItem('site', JSON.stringify({ site: this.form.site, site_show : this.form.site_show}))
-          localStorage.setItem('token', res.data.token)
-          localStorage.setItem('userDto', JSON.stringify(res.data.userDto))
-          this.$router.push('/cms/home')
+          if (res.data.status === 'error') {
+            return this.$Message.error(res.data.errorMessage)
+          } else {
+            this.$Message.success(res.msg)
+            localStorage.setItem('site', JSON.stringify({ site: this.form.site, site_show : this.form.site_show}))
+            localStorage.setItem('token', res.data.token)
+            localStorage.setItem('userDto', JSON.stringify(res.data.userDto))
+            this.$router.push('/cms/home')
+          }
         }
       })
     }
@@ -154,9 +140,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .view {
-  height: 100vh;
-  width: 100vw;
-  background: #4d8ef7;
+  height: 100%;
   padding: 0;
   overflow-x: hidden;
 }
@@ -168,11 +152,8 @@ export default {
   position: absolute;
   top: 8.8rem;
   padding: 1.7rem 1.5rem;
-  border-radius: 1.5rem 1.5rem 0 0;
   font-size: 18px !important;
   font-weight: bold;
-  background: #fff;
-  transform: translateX(1px) scaleX(1.01);
 }
 .logo {
   width: 6rem;
@@ -188,17 +169,45 @@ export default {
 }
 .header {
   color: #fff;
-  font-weight: bold;
-  font-family: "Lucida Sans", "Lucida Sans Regular", "Lucida Grande",
-    "Lucida Sans Unicode", Geneva, Verdana, sans-serif;
   font-size: 1.5rem;
   position: relative;
   width: 100%;
-  height: 20%;
   top: 3rem;
-  left: 2rem;
+ left: 1rem;
+}
+/deep/.inp{
+   background: #2A4470 !important;
+  opacity: 0.4;
+  border: none;
+}
+input{
+  color: #ffffff;
 }
 .inp:focus {
-  background: #fff !important;
+  //background: #fff !important;
+background-color: #04FFD5;
+  color: #ffffff;
+  border: 1px solid #76CFFF;
+}
+/deep/.col-2{
+  color: #ffffff;
+  font-family: PingFangSC-Medium, sans-serif;
+  text-shadow:1px 1px 1px #4FC9F2;
+  letter-spacing: 2px;
+}
+/deep/.col-3{
+ color: #ffffff;
+  font-family: PingFangSC-Medium, sans-serif;
+  text-shadow:1px 1px 1px #4FC9F2;
+  letter-spacing: 2px;
+}
+.btn_login{
+  background: url("../assets/images/btn_login.png");
+  display: flex;
+  height: 3.5rem;
+  justify-content: center;
+  align-items: center;
+  background-repeat: no-repeat;
+  background-size: cover;
 }
 </style>

+ 5 - 4
src/views/cms.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="width: 100%;height: 100%">
     <router-view class="bc" />
 
     <div class="footer">
@@ -284,9 +284,10 @@ export default {
 </script>
 <style lang="scss" scoped>
 .bc {
-  width: 100vw;
-  height: 100vh;
-  background: #f1f1f1;
+  height: 100%;
+  //background-image: url("../assets/images/bc.png");
+  //background-repeat: no-repeat ;
+  //background-size: cover;
 }
 .tabBar {
   width: 100%;

+ 115 - 127
src/views/page/Dispatch/detail.vue

@@ -87,148 +87,136 @@
   </div>
 </template>
 <script>
-  export default {
-    data () {
-      return {
-        tableData: [],
-        key_tableData: {},
-        send_goods_out: {},
-        data: {},
-        send_goods_out_product: {},
-        is_show: true,
-        is_use: false,
-        total_num: 0,
-        scan_num: 0,
-        saveData: 0,
-        transport_total: 0,
-        scan_data: [],
-        is_box_data: [],
-      }
-    },
-    mounted () {
-      // if (localStorage.getItem('fyy_target')) {
-      //   data.target = JSON.parse(localStorage.getItem('fyy_target'))
-      // }
-      this.tableData = []
-      const data = {
-        url: 'http://121.36.142.167:7774/jbl/api/module-data/send_goods_out/send_goods_out/474061443708694528/479522916090908672',
-        // 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},
-        header: ['Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiYXV0aCI6IlJPTEVfSU5ORVJfVVNFUixST0xFX0FETUlOLFJPTEVfSU5URVJGQUNFIiwidG9rZW5JZCI6IjM1IiwiZXhwIjoxNjk0Njc0MTE0fQ.L3Di3K_cpF0rWSgvzbcLufLm8bkCxd3Y-xudfKzSm4F-qdpDr0hYWWQP5K5BYTNuZnu4tWpGmSW2KRHU0pjt-A', 'Content-Type:application/json']
-      }
-      // console.log(data);
-      this.initData(data)
-
-
-      // console.log(data);
-
-    },
-    methods: {
-      //原始数据获取
-      initData (row) {
-        this.axios.post('/api/testdwyget', { ...row }).then(res => {
-          this.tableData.push(...res.data.data.send_goods_out_product);
-          res.data.data.send_goods_out_product.forEach((element, index) => {
-            this.data = res.data;
-            this.total_num = this.total_num + element.this_delivery_qty
-            this.transport_total = this.transport_total + element.out_qty
-            this.key_tableData[element.bus_item_id] = element;
-            if(element.box_orders_show){
-              this.is_box_data.push(this.deelUniqueKey(element));
-            }
-          });
+export default {
+  data () {
+    return {
+      tableData: [],
+      key_tableData: {},
+      send_goods_out: {},
+      data: {},
+      send_goods_out_product: {},
+      is_show: true,
+      is_use: false,
+      total_num: 0,
+      scan_num: 0,
+      saveData: 0,
+      transport_total: 0,
+      scan_data: [],
+      is_box_data: [],
+    }
+  },
+  mounted () {
+    // if (localStorage.getItem('fyy_target')) {
+    //   data.target = JSON.parse(localStorage.getItem('fyy_target'))
+    // }
+    this.tableData = []
+    const id = this.$route.query.id
+    const data = {
+      url: `http://121.36.142.167:7774/jbl/api/module-data/send_goods_out/send_goods_out/474061443708694528/${id}`
+      // 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},
+    }
+    // console.log(data);
+    this.initData(data)
+    // console.log(data);
+  },
+  methods: {
+    // 原始数据获取
+    initData (row) {
+      this.axios.post('/api/testdwyget', { ...row }).then(res => {
+        this.tableData.push(...res.data.data.send_goods_out_product);
+        res.data.data.send_goods_out_product.forEach((element, index) => {
+          this.data = res.data
+          this.total_num = this.total_num + element.this_delivery_qty
+          this.transport_total = this.transport_total + element.out_qty
+          this.key_tableData[element.bus_item_id] = element;
+          if (element.box_orders_show) {
+            this.is_box_data.push(this.deelUniqueKey(element));
+          }
+        })
         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"]},
-          header: ['Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiYXV0aCI6IlJPTEVfSU5ORVJfVVNFUixST0xFX0FETUlOLFJPTEVfSU5URVJGQUNFIiwidG9rZW5JZCI6IjM1IiwiZXhwIjoxNjk0Njc0MTE0fQ.L3Di3K_cpF0rWSgvzbcLufLm8bkCxd3Y-xudfKzSm4F-qdpDr0hYWWQP5K5BYTNuZnu4tWpGmSW2KRHU0pjt-A', 'Content-Type:application/json']
+          post: { "defective_order_no_list":["BZ00025"]}
         }
-        this.initDataBox(dataBox)
-
-
-        })
-
-      },
-      //扫描数据获取
-      initDataBox (row) {
-        this.axios.post('/api/testdwy', { ...row }).then(res => {
-          let scan_data = [];
-
-          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.initDataBox(dataBox)})
+    },
+    // 扫描数据获取
+    initDataBox (row) {
+      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();
       })
-      },
-      deelUniqueKey(element){
-        let key = element.box_orders_show
-        return key;
-      },
-      //将原始数据处理拼接成提交的数据
-      deelTableData(){
-        let new_table_data = [];
-        this.scan_data.forEach((element, index) => {
-              if(this.is_box_data.indexOf(element.box_no) == -1&&Object.keys(this.key_tableData).indexOf(element.order_item_id) != -1&&(this.key_tableData[element.order_item_id].this_delivery_qty-element.box_num)>0){
-
-                 let table_data_detail = JSON.parse(JSON.stringify(this.key_tableData[element.order_item_id]));
-                 table_data_detail.box_orders = element.box_id;
-                 table_data_detail.box_orders_show = element.box_no;
-                 table_data_detail.out_qty = element.box_num;
-                 table_data_detail.this_delivery_qty = element.box_num;
-                 table_data_detail.id = null;
-                 this.key_tableData[element.order_item_id].this_delivery_qty -= element.box_num;
-                 new_table_data.push(table_data_detail)
-            }
+    },
+    deelUniqueKey(element){
+      let key = element.box_orders_show
+      return key;
+    },
+    // 将原始数据处理拼接成提交的数据
+    deelTableData () {
+      let new_table_data = [];
+      this.scan_data.forEach((element, index) => {
+        if (this.is_box_data.indexOf(element.box_no) === -1 && Object.keys(this.key_tableData).indexOf(element.order_item_id) !== -1 && (this.key_tableData[element.order_item_id].this_delivery_qty-element.box_num)>0){
+          let table_data_detail = JSON.parse(JSON.stringify(this.key_tableData[element.order_item_id]))
+          table_data_detail.box_orders = element.box_id;
+          table_data_detail.box_orders_show = element.box_no;
+          table_data_detail.out_qty = element.box_num;
+          table_data_detail.this_delivery_qty = element.box_num;
+          table_data_detail.id = null;
+          this.key_tableData[element.order_item_id].this_delivery_qty -= element.box_num;
+          new_table_data.push(table_data_detail)
+        }
       })
-
-        this.tableData.forEach((element, index) => {
-            if(element.this_delivery_qty > 0 ){
+      this.tableData.forEach((element, index) => {
+        if (element.this_delivery_qty > 0 ){
           new_table_data.push(element)
         }
-        })
-        this.tableData = new_table_data;
-
+      })
+      this.tableData = new_table_data;
     },
-
-
-
-
-
-
-
-      //end
-      handelGoSure (qcode) {
-        console.log(       this.tableData );
-        this.tableData.forEach((element, index) => {
-          element.item_num = (index+1)
-        })
-        this.data.data.send_goods_out_product =this.tableData
-
-        console.log(JSON.stringify(this.data));
-      },
-      handleReturn () {
-        localStorage.removeItem('fyy_target')
-        this.$router.push('/cms/finish')
-      },
-      handleChoose (item, index) {
-        item.is_choose = !item.is_choose
-        this.tableData.splice(index, 1, item)
-      },
-      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;'
+    handelGoSure () {
+      console.log(this.tableData)
+      this.tableData.forEach((element, index) => {
+        element.item_num = (index + 1)
+      })
+      this.data.data.send_goods_out_product = this.tableData
+      let data = {
+        url:'http://121.36.142.167:7774/jbl/api/module-data/send_goods_out/send_goods_out',
+        post: this.data
+      }
+      this.axios.post('/api/testdwy', data).then(res => {
+        if (res.code === 200) {
+          this.$Message.success(res.msg)
+          this.$router.go(-1)
+        }
+      })
+      // console.log(JSON.stringify(this.data))
+    },
+    handleReturn () {
+      localStorage.removeItem('fyy_target')
+      this.$router.push('/cms/finish')
+    },
+    handleChoose (item, index) {
+      item.is_choose = !item.is_choose
+      this.tableData.splice(index, 1, item)
+    },
+    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;'
-        }
+      } else {
+        this.is_use = true
+        document.getElementsByClassName('header')[0].style = 'height:2.7rem;overflow:hidden;transition:all .4s;'
       }
     }
   }
+}
 </script>
 <style lang="scss" scoped>
   .header {

+ 1 - 2
src/views/page/Finish/detail.vue

@@ -105,8 +105,7 @@ export default {
     fyyTarget.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},
-        header: ['Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiYXV0aCI6IlJPTEVfSU5ORVJfVVNFUixST0xFX0FETUlOLFJPTEVfSU5URVJGQUNFIiwidG9rZW5JZCI6IjM1IiwiZXhwIjoxNjk0Njc0MTE0fQ.L3Di3K_cpF0rWSgvzbcLufLm8bkCxd3Y-xudfKzSm4F-qdpDr0hYWWQP5K5BYTNuZnu4tWpGmSW2KRHU0pjt-A', 'Content-Sign:a2898699a4433b413d8473e4b59d64b8', 'Content-Type:application/json']
+        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}
       }
       this.initData(data)
     })

+ 6 - 12
src/views/page/Finish/detailed.vue

@@ -189,8 +189,7 @@ export default {
     // 获取不良品原因
     const data2 = {
       url: 'http://121.36.142.167:7774/jbl/api/module-data/defective_list/page',
-      post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"dynamicFormCode":"defective","developmentSystemId":null,"debugFlag":true},
-      header: ['Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiYXV0aCI6IlJPTEVfSU5ORVJfVVNFUixST0xFX0FETUlOIiwidG9rZW5JZCI6IjM1IiwiZXhwIjoxNjk0MjM3NzIyfQ.aO1_RGWVxXygefwuUg_au3ys71zc2KuIbxZNWgTBeLRK9JVEqQZeza4X1gtoA8_BxoKZUuaPnTP9gUrEGgF3UQ', 'Content-Sign: 5fb0ea21d28dc57425577987fbeaf1dc', 'Content-Type:application/json']
+      post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"dynamicFormCode":"defective","developmentSystemId":null,"debugFlag":true}
     }
     this.axios.post('/api/testdwy', { ...data2 }).then(res => {
       this.breakList = res.data.content.filter(v => v.status)
@@ -202,8 +201,7 @@ export default {
     // 获取设备
     const data1 = {
       url: 'http://121.36.142.167:7774/jbl/api/module-data/device_list/page',
-      post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"dynamicFormCode":"device","developmentSystemId":null,"debugFlag":true},
-      header: ['Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiYXV0aCI6IlJPTEVfSU5ORVJfVVNFUixST0xFX0FETUlOIiwidG9rZW5JZCI6IjM1IiwiZXhwIjoxNjk0MjM3NzIyfQ.aO1_RGWVxXygefwuUg_au3ys71zc2KuIbxZNWgTBeLRK9JVEqQZeza4X1gtoA8_BxoKZUuaPnTP9gUrEGgF3UQ', 'Content-Sign: 27a0ae807d9437f5fdad7449cdf52e08', 'Content-Type:application/json']
+      post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"dynamicFormCode":"device","developmentSystemId":null,"debugFlag":true}
     }
     this.axios.post('/api/testdwy', { ...data1 }).then(res => {
       this.equipmentList = res.data.content.filter(v => v.status)
@@ -215,8 +213,7 @@ export default {
     // 获取班组
     const data = {
       url: 'http://121.36.142.167:7774/jbl/api/module-data/team_list/page',
-      post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"dynamicFormCode":"team","developmentSystemId":null,"debugFlag":true},
-      header: ['Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiYXV0aCI6IlJPTEVfSU5ORVJfVVNFUixST0xFX0FETUlOIiwidG9rZW5JZCI6IjM1IiwiZXhwIjoxNjk0MjM3NzIyfQ.aO1_RGWVxXygefwuUg_au3ys71zc2KuIbxZNWgTBeLRK9JVEqQZeza4X1gtoA8_BxoKZUuaPnTP9gUrEGgF3UQ', 'Content-Sign: 88cb27fd67215452422c18f3ed71028e', 'Content-Type:application/json']
+      post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"dynamicFormCode":"team","developmentSystemId":null,"debugFlag":true}
     }
     this.axios.post('/api/testdwy', { ...data }).then(res => {
       this.teamList = res.data.content.filter(v => v.status)
@@ -228,8 +225,7 @@ export default {
     // 获取人员
     const data3 = {
       url: 'http://121.36.142.167:7774/jbl/api/module-data/team_code_btn/page',
-      post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"workflowSearchBean":{},"dynamicFormCode":"person","dynamicFormTable":null,"ignoreField":true,"developmentSystemId":null,"debugFlag":true},
-      header: ['Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiYXV0aCI6IlJPTEVfSU5ORVJfVVNFUixST0xFX0FETUlOLFJPTEVfSU5URVJGQUNFIiwidG9rZW5JZCI6IjM1IiwiZXhwIjoxNjk0Njc0MTE0fQ.L3Di3K_cpF0rWSgvzbcLufLm8bkCxd3Y-xudfKzSm4F-qdpDr0hYWWQP5K5BYTNuZnu4tWpGmSW2KRHU0pjt-A', 'Content-Type:application/json']
+      post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"workflowSearchBean":{},"dynamicFormCode":"person","dynamicFormTable":null,"ignoreField":true,"developmentSystemId":null,"debugFlag":true}
     }
     this.axios.post('/api/testdwy', { ...data3 }).then(res => {
       this.employeeList = res.data.content
@@ -313,8 +309,7 @@ export default {
     //     // 获取班组下的人员
     //     const id = this.teamList.find(v => v.team_code === this.formData.team_id).dynamic_form_value_id
     //     const data = {
-    //       url: `http://121.36.142.167:7774/jbl/api/module-data/team/team/472629516238663680/${id}`,
-    //       header: ['Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiYXV0aCI6IlJPTEVfSU5ORVJfVVNFUixST0xFX0FETUlOIiwidG9rZW5JZCI6IjM1IiwiZXhwIjoxNjk0MjM3NzIyfQ.aO1_RGWVxXygefwuUg_au3ys71zc2KuIbxZNWgTBeLRK9JVEqQZeza4X1gtoA8_BxoKZUuaPnTP9gUrEGgF3UQ', 'Content-Type:application/json']
+    //       url: `http://121.36.142.167:7774/jbl/api/module-data/team/team/472629516238663680/${id}`
     //     }
     //     this.axios.post('/api/testdwyget', { ...data }).then(res => {
     //       this.employeeList = res.data.data.employee
@@ -359,8 +354,7 @@ export default {
               },
               completion_orders_dtl: [v]
             }
-          },
-          header: ['Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiYXV0aCI6IlJPTEVfSU5ORVJfVVNFUixST0xFX0FETUlOLFJPTEVfSU5URVJGQUNFIiwidG9rZW5JZCI6IjM1IiwiZXhwIjoxNjk0Njc0MTE0fQ.L3Di3K_cpF0rWSgvzbcLufLm8bkCxd3Y-xudfKzSm4F-qdpDr0hYWWQP5K5BYTNuZnu4tWpGmSW2KRHU0pjt-A', 'Content-Type:application/json']
+          }
         }
         this.axios.post('/api/testdwy', { ...data3 }).then(res => {
           if (res.code == 200) {

+ 22 - 17
src/views/page/Finish/index.vue

@@ -43,11 +43,10 @@
       </div>
     </div>
     <div class="bdy">
-      <div style="font-size: 1.3rem; font-weight: bold">工序</div>
+      <div style="font-size: 1.3rem; font-weight: bold">发货单号</div>
       <div>
-        <b-form-select
+        <Select
           v-model="selected"
-          :options="options"
           style="
             margin-top: 1rem;
             height: 3.4rem;
@@ -57,13 +56,12 @@
             background: #fff;
             border: 0.1rem solid;
           "
+          filterable
+          clearable
+          placeholder="请选择"
         >
-          <template v-slot:first>
-            <b-form-select-option value="" disabled
-              >请选择工序</b-form-select-option
-            >
-          </template></b-form-select
-        >
+         <Option v-for="(item,index) in options" :key="index" :label="item.text" :value="item.value"/>
+        </Select>
       </div>
       <div class="bdy_btn">
         <Button
@@ -98,24 +96,23 @@ export default {
   },
   created () {
     const data = {
-      url: 'http://121.36.142.167:7774/jbl/api/module-data/process_dossier/page',
-      post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"dynamicFormCode":"process_dossier","developmentSystemId":null,"debugFlag":true},
-      header: ['Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiYXV0aCI6IlJPTEVfSU5ORVJfVVNFUixST0xFX0FETUlOIiwidG9rZW5JZCI6IjM1IiwiZXhwIjoxNjk0MjM3NzIyfQ.aO1_RGWVxXygefwuUg_au3ys71zc2KuIbxZNWgTBeLRK9JVEqQZeza4X1gtoA8_BxoKZUuaPnTP9gUrEGgF3UQ', 'Content-Sign: b21779e9365ed84e4dd382ccdacc6d51', 'Content-Type:application/json']
+      url: 'http://121.36.142.167:7774/jbl/api/module-data/send_goods_out_list/page',
+      post:{"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"dynamicFormCode":"send_goods_out","developmentSystemId":null,"debugFlag":true}
     }
     this.axios.post('/api/testdwy', { ...data }).then(res => {
-      this.options = res.data.content
+      this.options = res.data.content.filter(v => v.status === "NOT_APPROVED")
       this.options.forEach(v => {
-        v.value = v.process_code
-        v.text = v.title
+        v.value = v.dynamic_form_value_id
+        v.text = v.send_goods_out_no
       })
     })
   },
   methods: {
     handelGoSure () {
       if (!this.selected) {
-        return this.$Message.warning('请先选择工序!')
+        return this.$Message.warning('请先选择发货单号!')
       }
-      this.$router.push({ path: '/cms/finish/detail', query: { id: this.selected } })
+      this.$router.push({ path: '/cms/dispatch/detail', query: { id: this.selected } })
     },
     handleReturn () {
       this.$router.push('/cms/home')
@@ -224,4 +221,12 @@ export default {
   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>

+ 1 - 1
src/views/page/Home.vue

@@ -148,7 +148,7 @@ export default {
       this.$router.push('/cms/Package/detail')
     },
     handleDispatch () {
-      this.$router.push('/cms/dispatch/detail')
+      this.$router.push('/cms/finish')
     },
     handleShow () {
       this.is_show = !this.is_show

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

@@ -108,8 +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},
-      header: ['Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiYXV0aCI6IlJPTEVfSU5ORVJfVVNFUixST0xFX0FETUlOLFJPTEVfSU5URVJGQUNFIiwidG9rZW5JZCI6IjM1IiwiZXhwIjoxNjk0Njc0MTE0fQ.L3Di3K_cpF0rWSgvzbcLufLm8bkCxd3Y-xudfKzSm4F-qdpDr0hYWWQP5K5BYTNuZnu4tWpGmSW2KRHU0pjt-A', 'Content-Type:application/json']
+      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}
     }
     this.initData(data)
   },

+ 17 - 15
src/views/page/Package/detailed.vue

@@ -124,8 +124,7 @@ export default {
     // 获取班组
     const data = {
       url: 'http://121.36.142.167:7774/jbl/api/module-data/team_list/page',
-      post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"dynamicFormCode":"team","developmentSystemId":null,"debugFlag":true},
-      header: ['Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiYXV0aCI6IlJPTEVfSU5ORVJfVVNFUixST0xFX0FETUlOLFJPTEVfSU5URVJGQUNFIiwidG9rZW5JZCI6IjM1IiwiZXhwIjoxNjk0Njc0MTE0fQ.L3Di3K_cpF0rWSgvzbcLufLm8bkCxd3Y-xudfKzSm4F-qdpDr0hYWWQP5K5BYTNuZnu4tWpGmSW2KRHU0pjt-A', 'Content-Type:application/json']
+      post: {"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"dynamicFormCode":"team","developmentSystemId":null,"debugFlag":true}
     }
     this.axios.post('/api/testdwy', { ...data }).then(res => {
       this.teamList = res.data.content.filter(v => v.status)
@@ -137,8 +136,7 @@ export default {
     // 获取人员
     const data1 = {
       url: 'http://121.36.142.167:7774/jbl/api/module-data/team_code_btn/page',
-      post:{"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"workflowSearchBean":{},"dynamicFormCode":"person","dynamicFormTable":null,"ignoreField":true,"developmentSystemId":null,"debugFlag":true},
-      header: ['Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiYXV0aCI6IlJPTEVfSU5ORVJfVVNFUixST0xFX0FETUlOLFJPTEVfSU5URVJGQUNFIiwidG9rZW5JZCI6IjM1IiwiZXhwIjoxNjk0Njc0MTE0fQ.L3Di3K_cpF0rWSgvzbcLufLm8bkCxd3Y-xudfKzSm4F-qdpDr0hYWWQP5K5BYTNuZnu4tWpGmSW2KRHU0pjt-A', 'Content-Type:application/json']
+      post:{"direction":"DESC","property":"id","fromClientType":"pc","number":0,"sorts":[],"rules":[],"size":15,"specialConditions":[],"workflowSearchBean":{},"dynamicFormCode":"person","dynamicFormTable":null,"ignoreField":true,"developmentSystemId":null,"debugFlag":true}
     }
     this.axios.post('/api/testdwy', { ...data1 }).then(res => {
       this.employeeList = res.data.content
@@ -178,8 +176,7 @@ export default {
         // 获取班组下的人员
         const id = this.teamList.find(v => v.team_code === e).dynamic_form_value_id
         const data = {
-          url: `http://121.36.142.167:7774/jbl/api/module-data/team/team/472629516238663680/${id}`,
-          header: ['Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiYXV0aCI6IlJPTEVfSU5ORVJfVVNFUixST0xFX0FETUlOIiwidG9rZW5JZCI6IjM1IiwiZXhwIjoxNjk0MjM3NzIyfQ.aO1_RGWVxXygefwuUg_au3ys71zc2KuIbxZNWgTBeLRK9JVEqQZeza4X1gtoA8_BxoKZUuaPnTP9gUrEGgF3UQ', 'Content-Type:application/json']
+          url: `http://121.36.142.167:7774/jbl/api/module-data/team/team/472629516238663680/${id}`
         }
         this.axios.post('/api/testdwyget', { ...data }).then(res => {
           this.list[index].employee_id = res.data.data.employee.map(v => v.team_code)
@@ -191,14 +188,12 @@ export default {
       this.$router.go(-1)
     },
     handleSure () {
-
       let box_orders_products = [];
       let team_id = '';
-      let team_name = '';
-      let employee_ids = '';
-      let employee_names = '';
+      // let team_name = '';
+      // let employee_ids = '';
+      // let employee_names = '';
       this.list.forEach((v,index) => {
-
         let box_orders_product = {
           "item_num": (index+1),
           "product_no": v.material_code,
@@ -222,8 +217,7 @@ export default {
           "dealer_name": v.exe_sale_order_b.jingxiaoshang_show,
           "box_num": v.un_box_num
         }
-        team_id = v.team_id;
-
+        team_id = v.team_id
         box_orders_products.push(box_orders_product);
       })
       const box_orders = {
@@ -254,8 +248,16 @@ export default {
           "production_orders_dtl" : box_orders_products,
         }
       }
-      console.log(JSON.stringify(data));return false;
-
+      let data1 = {
+        url:'http://121.36.142.167:7774/jbl/api/module-data/box_orders/box_orders',
+        post: data
+      }
+      this.axios.post('/api/testdwy', data1).then(res => {
+        if (res.code === 200) {
+          this.$Message.success(res.msg)
+          this.$router.go(-1)
+        }
+      })
     }
   }
 }

+ 131 - 0
src/views/page/print.vue

@@ -0,0 +1,131 @@
+<template>
+  <div style="height: 100vh">
+    <div class="header">
+      <div style="font-size: 20px;margin: 15px;font-weight: bold; text-shadow:1px 1px 1px #4FC9F2;
+  letter-spacing: 2px;">芯片打印</div>
+      <Button ghost style="margin: 15px" @click="handlePrint">打印</Button></div>
+    <div class="bdy">
+     <div v-for="(item,index) in list" :key="index" :class="item.is_choose?'choose_item':'item'" @click="handleClick(index)">
+       <div style="margin-bottom:10px">
+         <span>派工单号:</span>
+         <span>{{item.dispatch_no}}</span>
+       </div>
+<!--       <div>-->
+<!--         <span>派工单号:</span>-->
+<!--         <span>{{item.dispatch_no}}</span>-->
+<!--       </div>-->
+     </div>
+    </div>
+  </div>
+</template>
+<script>
+import $ from 'jquery'
+
+export default {
+  data () {
+    return {
+      list: [],
+      selectData: []
+    }
+  },
+  mounted () {
+    if (this.$route.query.print_list) {
+      let text = decodeURIComponent(this.$route.query.print_list)
+      // text.shift()
+      // text.pop()
+      this.list = JSON.parse(text)
+      // eslint-disable-next-line no-return-assign
+      this.list.forEach(v => v.is_choose = false)
+    }
+  },
+  methods: {
+    handleClick (index) {
+      this.list[index].is_choose = !this.list[index].is_choose
+      this.selectData = this.list.filter(v => v.is_choose)
+      this.$forceUpdate()
+    },
+    handlePrint () {
+      if (this.selectData.length === 0) {
+        return this.$Message.warning('请选择需要打印的标签')
+      }
+      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 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({
+        type: "post",
+        url: 'http://127.0.0.1:888/postek/print',
+        data: { reqParam: 1, printparams },
+        dataType: "json",
+        timeout: 5000,
+        success: function (result) {
+          // _this.getChipDetail();
+          if (result.retval == "0") {
+            _this.$Message.success("发送成功");
+          } else {
+            _this.$Message.error("发送失败,返回结果:" + result.msg);
+          }
+        },
+        error: function () {
+
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.header{
+  display: flex;
+justify-content: space-between;
+align-items: center;
+  border-bottom: 1px solid #356070;
+}
+.bdy{
+  height: calc(100% - 5rem);
+  display: flex;
+  flex-wrap: wrap;
+  overflow: auto;
+}
+.bdy::-webkit-scrollbar{
+  width: 8px;
+}
+.bdy::-webkit-scrollbar-track{
+  background: linear-gradient(to bottom,#f5f5f5, #002359);
+}
+.bdy::-webkit-scrollbar-thumb{
+  background: linear-gradient(to bottom, #a1a1a1, #3b4169);
+  border-radius: 5px;
+  box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+}
+.choose_item{
+cursor: pointer;
+  border-radius: 20px;
+  background: #ffffff;
+  color: black;
+  display: flex;
+  align-items: center;
+  padding: 10px;
+  margin: 20px 0 20px 2.5%;
+  width: 30%;
+  height: 80px;
+}
+.item{
+  display: flex;
+align-items: center;
+  cursor: pointer;
+  border: 1px solid #797878;
+  color: #797878;
+  border-radius: 20px;
+  padding: 10px;
+  margin: 20px 0 20px 2.5%;
+  width: 30%;
+  height: 80px;
+}
+</style>

+ 10 - 0
vue.config.js

@@ -8,6 +8,16 @@ module.exports = {
   productionSourceMap: process.env.NODE_ENV === 'development',
   devServer: {
     // https: true,
+    proxy: {
+      "/postek/print": {
+        target: "http://192.168.1.110:888",
+        ws: true, // proxy websockets
+        changeOrigin: true,
+        // pathRewrite: {
+        //     '^/postek': '', // rewrite path
+        // },
+      }
+    }
   },
   lintOnSave: false // 禁用eslint  便于开发
 }

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