mushencc 9 meses atrás
pai
commit
d3b4a624b8
51 arquivos alterados com 306 adições e 151 exclusões
  1. 0 0
      dist/index.html
  2. 1 0
      dist/static/css/app.89f5b213.css
  3. 0 0
      dist/static/css/chunk-1349f135.2378da9e.css
  4. 1 0
      dist/static/css/chunk-1ad98f64.efbf0959.css
  5. 1 0
      dist/static/css/chunk-24c6345a.a381c0df.css
  6. 0 0
      dist/static/css/chunk-253e128a.ed55f68c.css
  7. 1 0
      dist/static/css/chunk-2eb2b4a2.5c560e46.css
  8. 1 0
      dist/static/css/chunk-319c5e32.cfeebe0e.css
  9. 1 0
      dist/static/css/chunk-3bcac840.cbb5c112.css
  10. 1 0
      dist/static/css/chunk-3dbdd07b.7ecffaa3.css
  11. 0 0
      dist/static/css/chunk-4b4dbbdd.86b8418a.css
  12. 1 0
      dist/static/css/chunk-4ce7f775.bc5798dc.css
  13. 0 0
      dist/static/css/chunk-5b364005.51934d66.css
  14. 0 0
      dist/static/css/chunk-613dc66c.0f0c4daf.css
  15. 1 0
      dist/static/css/chunk-69d4c6c7.3215af60.css
  16. 0 0
      dist/static/css/chunk-719fc3bb.7b2c960b.css
  17. 1 0
      dist/static/css/chunk-7732a8da.e535b8ee.css
  18. 1 0
      dist/static/css/chunk-79e6a954.74b90ca6.css
  19. 1 0
      dist/static/css/chunk-bc881418.f4d382c6.css
  20. 1 0
      dist/static/css/chunk-d8321da8.940a8028.css
  21. 0 0
      dist/static/css/chunk-f38fb816.d1c04b8d.css
  22. 1 0
      dist/static/css/chunk-f76f34b0.77d762c2.css
  23. BIN
      dist/static/img/time.2ebb52cd.png
  24. 0 0
      dist/static/js/app.8b8fb2c0.js
  25. 0 0
      dist/static/js/chunk-1349f135.d1a21410.js
  26. 0 0
      dist/static/js/chunk-1ad98f64.31794325.js
  27. 0 0
      dist/static/js/chunk-24c6345a.ce12fc4f.js
  28. 0 0
      dist/static/js/chunk-253e128a.7cd2634f.js
  29. 0 0
      dist/static/js/chunk-2eb2b4a2.8840cc2b.js
  30. 0 0
      dist/static/js/chunk-319c5e32.029c36eb.js
  31. 1 0
      dist/static/js/chunk-3bcac840.32d07105.js
  32. 0 0
      dist/static/js/chunk-3dbdd07b.8bbfd46f.js
  33. 0 0
      dist/static/js/chunk-4b4dbbdd.92549642.js
  34. 1 0
      dist/static/js/chunk-4ce7f775.ba965e06.js
  35. 0 0
      dist/static/js/chunk-537c879e.15a1b7d3.js
  36. 0 0
      dist/static/js/chunk-5b364005.4a57f664.js
  37. 0 0
      dist/static/js/chunk-613dc66c.4d8a4002.js
  38. 0 0
      dist/static/js/chunk-69d4c6c7.3cf76903.js
  39. 0 0
      dist/static/js/chunk-719fc3bb.5885fd3e.js
  40. 0 0
      dist/static/js/chunk-7732a8da.06edcd20.js
  41. 1 0
      dist/static/js/chunk-79e6a954.5dd86f89.js
  42. 0 0
      dist/static/js/chunk-bc881418.dea490ca.js
  43. 0 0
      dist/static/js/chunk-d6085eaa.119a371d.js
  44. 0 0
      dist/static/js/chunk-d8321da8.9a17d452.js
  45. 1 0
      dist/static/js/chunk-f38fb816.28da7dc8.js
  46. 0 0
      dist/static/js/chunk-f76f34b0.4de4c1c0.js
  47. 35 13
      src/views/BigScreen/detail.vue
  48. 227 133
      src/views/page/Dispatch/detail.vue
  49. 10 2
      src/views/page/Finish/index.vue
  50. 2 2
      src/views/page/Package/detail.vue
  51. 14 1
      src/views/page/Package/detailed.vue

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/index.html


+ 1 - 0
dist/static/css/app.89f5b213.css

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

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/chunk-1349f135.2378da9e.css


+ 1 - 0
dist/static/css/chunk-1ad98f64.efbf0959.css

@@ -0,0 +1 @@
+.bdy[data-v-2e455708]{height:calc(100% - 6rem);overflow:auto}.bdy[data-v-2e455708]::-webkit-scrollbar{width:1px}.bdy .item[data-v-2e455708]{background-color:#2a4470}.bdy .item .itemmingxi[data-v-2e455708],.bdy .item[data-v-2e455708]{width:98%;display:flex;flex-wrap:wrap;margin:0 1% 1% 1%;border-radius:20px;position:relative}.bdy .item .itemmingxi[data-v-2e455708]{background-color:#012248}.bdy .item .itemmingxi div[data-v-2e455708]{color:#fff;width:22%;margin:1%}.bdy .item .itemmingxi div label[data-v-2e455708]{width:6rem;text-align:right}.bdy .item .it_ti[data-v-2e455708]{color:#fff;width:22%;display:flex;align-items:center;margin:1%}.bdy .item .it_ti label[data-v-2e455708]{width:6rem;text-align:right}[data-v-2e455708] .ivu-form-item-label{color:#fff!important;font-size:1.3rem}[data-v-2e455708] .ivu-divider-inner-text{color:#fff}[data-v-2e455708] .ivu-divider{margin:2px 0}

+ 1 - 0
dist/static/css/chunk-24c6345a.a381c0df.css

@@ -0,0 +1 @@
+.header[data-v-5a6fd2ee]{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-5a6fd2ee]{border-radius:.5rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-5a6fd2ee]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-5a6fd2ee]{position:relative;top:-1.3rem}.header_middle1[data-v-5a6fd2ee]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-5a6fd2ee]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-5a6fd2ee]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-5a6fd2ee],[data-v-5a6fd2ee] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-5a6fd2ee]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-5a6fd2ee]{font-size:.5rem;color:#f4882a}.bdy[data-v-5a6fd2ee]{height:14.09rem;background-image:url(../../static/img/packUpback.a42a8fa6.png);background-size:100% 100%;padding:1.78rem 2.03rem;box-sizing:border-box;position:absolute;width:94%;transform:translate(-50%,-50%);top:40%;border-radius:1rem;left:50%}.bdy_btn[data-v-5a6fd2ee]{margin-top:2rem;display:flex;justify-content:center;align-items:center}.select_list[data-v-5a6fd2ee]{border-radius:.38rem;border:.03rem solid #76cfff;background-color:transparent;outline:none;padding:0 .625rem;box-sizing:border-box;color:#fff;width:100%;height:100%;font-weight:500;letter-spacing:.1rem}[data-v-5a6fd2ee].inp{background:#032a64!important;color:#fff}[data-v-5a6fd2ee]::-webkit-input-placeholder{color:hsla(0,0%,100%,.5176470588)}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/chunk-253e128a.ed55f68c.css


+ 1 - 0
dist/static/css/chunk-2eb2b4a2.5c560e46.css

@@ -0,0 +1 @@
+.bdy[data-v-06e1526a]{height:calc(100% - 6rem);overflow:auto}.bdy[data-v-06e1526a]::-webkit-scrollbar{width:1px}.bdy .item[data-v-06e1526a]{background-color:#2a4470}.bdy .item .itemmingxi[data-v-06e1526a],.bdy .item[data-v-06e1526a]{width:98%;display:flex;flex-wrap:wrap;margin:0 1% 1% 1%;border-radius:20px;position:relative}.bdy .item .itemmingxi[data-v-06e1526a]{background-color:#012248}.bdy .item .itemmingxi div[data-v-06e1526a]{color:#fff;width:22%;margin:1%}.bdy .item .itemmingxi div label[data-v-06e1526a]{width:6rem;text-align:right}.bdy .item .it_ti[data-v-06e1526a]{color:#fff;width:22%;display:flex;align-items:center;margin:1%}.bdy .item .it_ti label[data-v-06e1526a]{width:6rem;text-align:right}[data-v-06e1526a] .ivu-form-item-label{color:#fff!important;font-size:1.3rem}[data-v-06e1526a] .ivu-divider-inner-text{color:#fff}[data-v-06e1526a] .ivu-divider{margin:2px 0}

+ 1 - 0
dist/static/css/chunk-319c5e32.cfeebe0e.css

@@ -0,0 +1 @@
+@keyframes example-66db8c11{0%{left:600px}to{left:0}}.isred[data-v-66db8c11]{color:red}.isg[data-v-66db8c11]{color:#0f3}#dy[data-v-66db8c11]{overflow:auto}#dy[data-v-66db8c11]::-webkit-scrollbar{width:1px}.dong[data-v-66db8c11]:first-child{position:relative;animation-name:example-66db8c11;animation-duration:.9s}

+ 1 - 0
dist/static/css/chunk-3bcac840.cbb5c112.css

@@ -0,0 +1 @@
+.header[data-v-29504fe0]{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-29504fe0]{border-radius:.5rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-29504fe0]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-29504fe0]{position:relative;top:-1.3rem}.header_middle1[data-v-29504fe0]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-29504fe0]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-29504fe0]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-29504fe0],[data-v-29504fe0] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-29504fe0]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-29504fe0]{font-size:.5rem;color:#f4882a}.bdy[data-v-29504fe0]{height:14.09rem;background-image:url(../../static/img/packUpback.a42a8fa6.png);background-size:100% 100%;padding:1.78rem 2.03rem;box-sizing:border-box;position:absolute;width:94%;transform:translate(-50%,-50%);top:40%;border-radius:1rem;left:50%}.bdy_btn[data-v-29504fe0]{margin-top:2rem;display:flex;justify-content:center;align-items:center}.select_list[data-v-29504fe0]{border-radius:.38rem;border:.03rem solid #76cfff;background-color:transparent;outline:none;padding:0 .625rem;box-sizing:border-box;color:#fff;width:100%;height:100%;font-weight:500;letter-spacing:.1rem}[data-v-29504fe0].inp{background:#032a64!important;color:#fff}[data-v-29504fe0]::-webkit-input-placeholder{color:hsla(0,0%,100%,.5176470588)}

+ 1 - 0
dist/static/css/chunk-3dbdd07b.7ecffaa3.css

@@ -0,0 +1 @@
+.bdy[data-v-726d84a8]{height:calc(100% - 6rem);overflow:auto}.bdy[data-v-726d84a8]::-webkit-scrollbar{width:1px}.bdy .item[data-v-726d84a8]{background-color:#2a4470}.bdy .item .itemmingxi[data-v-726d84a8],.bdy .item[data-v-726d84a8]{width:98%;display:flex;flex-wrap:wrap;margin:0 1% 1% 1%;border-radius:20px;position:relative}.bdy .item .itemmingxi[data-v-726d84a8]{background-color:#012248}.bdy .item .itemmingxi div[data-v-726d84a8]{color:#fff;width:22%;margin:1%}.bdy .item .itemmingxi div label[data-v-726d84a8]{width:6rem;text-align:right}.bdy .item .it_ti[data-v-726d84a8]{color:#fff;width:22%;display:flex;align-items:center;margin:1%}.bdy .item .it_ti label[data-v-726d84a8]{width:6rem;text-align:right}[data-v-726d84a8] .ivu-form-item-label{color:#fff!important;font-size:1.3rem}[data-v-726d84a8] .ivu-divider-inner-text{color:#fff}[data-v-726d84a8] .ivu-divider{margin:2px 0}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/chunk-4b4dbbdd.86b8418a.css


+ 1 - 0
dist/static/css/chunk-4ce7f775.bc5798dc.css

@@ -0,0 +1 @@
+.bdy[data-v-a874f726]{display:flex;flex-wrap:wrap;overflow:auto}.bdy div[data-v-a874f726]{width:30%;height:20vh;color:#fff;border:1px solid;margin:10vh 10%;display:flex;border-radius:20px;justify-content:center;align-items:center;font-size:40px}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/chunk-5b364005.51934d66.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/chunk-613dc66c.0f0c4daf.css


+ 1 - 0
dist/static/css/chunk-69d4c6c7.3215af60.css

@@ -0,0 +1 @@
+.header[data-v-72bf62de]{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-72bf62de]{border-radius:.5rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-72bf62de]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-72bf62de]{position:relative;top:-1.3rem}.header_middle1[data-v-72bf62de]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-72bf62de]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-72bf62de]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-72bf62de],[data-v-72bf62de] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-72bf62de]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-72bf62de]{font-size:.5rem;color:#f4882a}.bdy[data-v-72bf62de]{height:21.09rem;background-image:url(../../static/img/packUpback.a42a8fa6.png);background-size:100% 100%;padding:1.78rem 2.03rem;box-sizing:border-box;position:absolute;width:94%;transform:translate(-50%,-50%);top:40%;border-radius:1rem;left:50%}.bdy_btn[data-v-72bf62de]{margin-top:2rem;display:flex;justify-content:center;align-items:center}.select_list[data-v-72bf62de]{border-radius:.38rem;border:.03rem solid #76cfff;background-color:transparent;outline:none;padding:0 .625rem;box-sizing:border-box;color:#fff;width:100%;height:100%;font-weight:500;letter-spacing:.1rem}[data-v-72bf62de].inp{background:#032a64!important;color:#fff}[data-v-72bf62de]::-webkit-input-placeholder{color:hsla(0,0%,100%,.5176470588)}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/chunk-719fc3bb.7b2c960b.css


+ 1 - 0
dist/static/css/chunk-7732a8da.e535b8ee.css

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

+ 1 - 0
dist/static/css/chunk-79e6a954.74b90ca6.css

@@ -0,0 +1 @@
+.header[data-v-1c1fe307]{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-1c1fe307]{border-radius:.5rem;padding:.1rem;width:5rem;display:flex;justify-content:space-around;align-items:center}.header_top[data-v-1c1fe307]{display:flex;justify-content:space-between;align-items:center}.ot[data-v-1c1fe307]{position:relative;top:-1.3rem}.header_middle1[data-v-1c1fe307]{display:flex;justify-content:space-between;align-items:center}.header_middle1 .ft[data-v-1c1fe307]{font-size:1.5rem;width:5rem;text-align:center}.header_middle[data-v-1c1fe307]{position:relative;top:-.3rem;display:flex;justify-content:space-between;align-items:center}.btn-group-vertical>.btn[data-v-1c1fe307],[data-v-1c1fe307] .btn-group>.btn{background:#fff;color:#2c3e50;outline:none;border:none;margin:0;z-index:3}.header_footer[data-v-1c1fe307]{position:relative;top:-1.7rem;display:flex;justify-content:space-between;align-items:center}.header_footer div[data-v-1c1fe307]{font-size:.5rem;color:#f4882a}.bdy[data-v-1c1fe307]{height:14.09rem;background-image:url(../../static/img/packUpback.a42a8fa6.png);background-size:100% 100%;padding:1.78rem 2.03rem;box-sizing:border-box;position:absolute;width:94%;transform:translate(-50%,-50%);top:40%;border-radius:1rem;left:50%}.bdy_btn[data-v-1c1fe307]{margin-top:2rem;display:flex;justify-content:center;align-items:center}.select_list[data-v-1c1fe307]{border-radius:.38rem;border:.03rem solid #76cfff;background-color:transparent;outline:none;padding:0 .625rem;box-sizing:border-box;color:#fff;width:100%;height:100%;font-weight:500;letter-spacing:.1rem}[data-v-1c1fe307].inp{background:#032a64!important;color:#fff}[data-v-1c1fe307]::-webkit-input-placeholder{color:hsla(0,0%,100%,.5176470588)}

+ 1 - 0
dist/static/css/chunk-bc881418.f4d382c6.css

@@ -0,0 +1 @@
+.choose2[data-v-523c2f6e]{color:#03fcd3;position:relative}.bc[data-v-523c2f6e]{height:100%}.tabBar[data-v-523c2f6e]{width:100%;color:#a8a2a2}.footer[data-v-523c2f6e]{position:absolute;bottom:0;width:100%;height:3.06rem;z-index:1;background-image:url(../../static/img/tabbarlist.0ccaf302.png)}.nav-link[data-v-523c2f6e]{color:#abdfff}.h5[data-v-523c2f6e]{margin-bottom:0;position:relative;top:.24rem}.nav[data-v-523c2f6e]{--bs-nav-link-padding-x:0rem;--bs-nav-link-padding-y:0rem}.choose[data-v-523c2f6e]{color:#03fcd3}.circle[data-v-523c2f6e]{width:3rem;height:3rem;margin:0 auto;position:absolute}.choose_1[data-v-523c2f6e],.choose_3[data-v-523c2f6e]{border-radius:50%;background:#03fcd3;top:-.3rem;left:50%;transform:translate(-50%,-50%);line-height:2.3;z-index:2}[data-v-523c2f6e].ivu-modal{top:40%}[data-v-523c2f6e].ivu-modal-content{background-color:transparent!important}[data-v-523c2f6e].ivu-modal-body{padding:0}[data-v-523c2f6e].ivu-btn-primary{background-color:#0f4680}

+ 1 - 0
dist/static/css/chunk-d8321da8.940a8028.css

@@ -0,0 +1 @@
+.header[data-v-bd7169ba]{display:flex;justify-content:space-between;align-items:center;border-bottom:1px solid #356070}.bdy[data-v-bd7169ba]{height:calc(100% - 5rem);display:flex;flex-wrap:wrap;overflow:auto}.bdy[data-v-bd7169ba]::-webkit-scrollbar{width:8px}.bdy[data-v-bd7169ba]::-webkit-scrollbar-track{background:linear-gradient(180deg,#f5f5f5,#002359)}.bdy[data-v-bd7169ba]::-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-bd7169ba]{display:flex;flex-wrap:wrap;cursor:pointer;border-radius:20px;background:#fff;color:#545353;padding:10px;margin:20px 0 20px 2.5%;width:30%;height:200px}.choose_item>div[data-v-bd7169ba]{display:flex}.item[data-v-bd7169ba]{display:flex;flex-wrap:wrap;cursor:pointer;border:1px solid #797878;color:#797878;border-radius:20px;padding:10px;margin:20px 0 20px 2.5%;width:30%;height:200px}.item>div[data-v-bd7169ba]{display:flex}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/chunk-f38fb816.d1c04b8d.css


+ 1 - 0
dist/static/css/chunk-f76f34b0.77d762c2.css

@@ -0,0 +1 @@
+.view[data-v-eb9816da]{height:100%;padding:0;overflow-x:hidden}.form[data-v-eb9816da]{box-sizing:border-box;width:100%;height:100%;color:#fff;position:absolute;top:7.5rem;padding:1.7rem 1.5rem;font-size:18px!important;font-weight:700}.logo[data-v-eb9816da]{width:6rem;height:6rem;position:absolute;top:20%;left:50%;transform:translate(-50%,-70%)}.logo img[data-v-eb9816da]{width:100%;height:100%}.header[data-v-eb9816da]{color:#fff;font-size:1.5rem;position:relative;width:100%;top:1.6rem;left:1rem}[data-v-eb9816da]::-webkit-input-placeholder{color:hsla(0,0%,100%,.5176470588)}[data-v-eb9816da].inp{background:#2a4470!important;border:none;color:#fff}input[data-v-eb9816da]{color:#fff}.inp[data-v-eb9816da]:focus{background-color:#04ffd5;color:#fff;border:1px solid #76cfff}[data-v-eb9816da].col-2,[data-v-eb9816da].col-4{color:#fff;font-family:PingFangSC-Medium,sans-serif;text-shadow:1px 1px 1px #4fc9f2;letter-spacing:2px}.btn_login[data-v-eb9816da]{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}

BIN
dist/static/img/time.2ebb52cd.png


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.8b8fb2c0.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-1349f135.d1a21410.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-1ad98f64.31794325.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-24c6345a.ce12fc4f.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-253e128a.7cd2634f.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-2eb2b4a2.8840cc2b.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-319c5e32.029c36eb.js


+ 1 - 0
dist/static/js/chunk-3bcac840.32d07105.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-3bcac840"],{4462:function(e,t,s){"use strict";s.r(t);var i=function(){var e=this,t=e._self._c;return t("div",[t("div",{staticClass:"bdy"},[t("div",{staticStyle:{"font-size":"1.3rem","font-weight":"bold",color:"#fff","margin-bottom":"1rem"}},[e._v("销售单号")]),t("div",{staticClass:"secd_input_r"},[t("b-form-select",{staticClass:"inp select_list",staticStyle:{height:"3rem"},attrs:{id:"input-3",options:e.options,required:"",placeholder:"请选择站点"},model:{value:e.selected,callback:function(t){e.selected=t},expression:"selected"}})],1),t("div",{staticClass:"bdy_btn"},[t("Button",{staticClass:"header_btn",staticStyle:{"margin-right":"3rem",height:"2.6rem"},attrs:{type:"warning",ghost:""},on:{click:e.handleReturn}},[e._v(" 返回")]),t("Button",{staticClass:"header_btn",staticStyle:{"margin-left":"3rem",height:"2.6rem"},attrs:{ghost:""},on:{click:e.handelGoSure}},[e._v(" 确认")])],1)])])},a=[],o={data(){return{is_show:!0,is_use:!1,selected:"",options:[]}},created(){const e={url:"http://122.112.250.253:7774/jbl/api/module-data/exe_sale_order_b/page",post:{direction:"DESC",property:"id",fromClientType:"pc",number:0,sorts:[],rules:[],size:99,specialConditions:[],dynamicFormCode:"exe_sale_order_b",developmentSystemId:null,debugFlag:!1}};this.axios.post("/api/testdwy",{...e}).then(e=>{this.options=e.data.content,this.options.forEach(e=>{e.value=e.exe_sale_order_b.no,e.text=e.exe_sale_order_b.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")}}},n=o,r=(s("566d"),s("2877")),l=Object(r["a"])(n,i,a,!1,null,"29504fe0",null);t["default"]=l.exports},"566d":function(e,t,s){"use strict";s("5c1e")},"5c1e":function(e,t,s){}}]);

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-3dbdd07b.8bbfd46f.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-4b4dbbdd.92549642.js


+ 1 - 0
dist/static/js/chunk-4ce7f775.ba965e06.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-4ce7f775"],{"686f":function(t,e,i){"use strict";i.r(e);var s=function(){var t=this,e=t._self._c;return e("div",{staticStyle:{height:"100vh"}},[e("div",{staticStyle:{position:"absolute",right:"10px",top:"10px"}},[e("Button",{staticStyle:{width:"5rem",height:"2rem","font-size":"1rem"},attrs:{type:"primary",ghost:t.is_pc},on:{click:t.handleChangeState}},[t._v(t._s(t.is_pc?"PC":"工位屏"))])],1),e("div",{staticClass:"bdy"},[e("div",{on:{click:function(e){return t.handleGo(1)}}},[t._v("完工")]),e("div",{on:{click:function(e){return t.handleGo(2)}}},[t._v("质检")]),e("div",{on:{click:function(e){return t.handleGo(3)}}},[t._v("包装")]),e("div",{on:{click:function(e){return t.handleGo(4)}}},[t._v("包装打印")])])])},c=[];document.title="工位屏";var a={data(){return{is_pc:!1}},created(){this.is_pc=!!localStorage.getItem("is_pc")&&JSON.parse(localStorage.getItem("is_pc"));let t=JSON.parse(JSON.stringify(this.$route.query));if(!t.Authorization||!t.site)return this.$Message.warning({content:"请联系开发者,缺少站点和人员信息!",duration:0,closable:!0});let e={site:t.site},i=t.Authorization,s="prod"==t.systemType?"http://122.112.250.253:7774/":"test"==t.systemType?"http://121.36.142.167:7774/":"";localStorage.setItem("site",JSON.stringify(e)),localStorage.setItem("token",i),localStorage.setItem("dwy_url",s)},methods:{handleChangeState(){this.is_pc=!this.is_pc,localStorage.setItem("is_pc",this.is_pc)},handleGo(t){switch(t){case 1:this.$router.push("/cms/chipFinish");break;case 2:this.$router.push("/cms/chipQualityTesting");break;case 3:this.$router.push("/cms/chipPackage");break;case 4:this.$router.push("/cms/chipBoxOrder");break}}}},r=a,n=(i("bc32"),i("2877")),o=Object(n["a"])(r,s,c,!1,null,"a874f726",null);e["default"]=o.exports},9777:function(t,e,i){},bc32:function(t,e,i){"use strict";i("9777")}}]);

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-537c879e.15a1b7d3.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-5b364005.4a57f664.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-613dc66c.4d8a4002.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-69d4c6c7.3cf76903.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-719fc3bb.5885fd3e.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-7732a8da.06edcd20.js


+ 1 - 0
dist/static/js/chunk-79e6a954.5dd86f89.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-79e6a954"],{8146:function(t,e,s){},ccd2:function(t,e,s){"use strict";s.r(e);var i=function(){var t=this,e=t._self._c;return e("div",[e("div",{staticClass:"bdy"},[e("div",{staticStyle:{"font-size":"1.3rem","font-weight":"bold",color:"#fff","margin-bottom":"1rem"}},[t._v("盘点单号")]),e("div",{staticClass:"secd_input_r"},[e("b-form-select",{staticClass:"inp select_list",staticStyle:{height:"3rem"},attrs:{id:"input-3",options:t.options,required:"",placeholder:"请选择站点"},model:{value:t.selected,callback:function(e){t.selected=e},expression:"selected"}})],1),e("div",{staticClass:"bdy_btn"},[e("Button",{staticClass:"header_btn",staticStyle:{"margin-right":"3rem",height:"2.6rem"},attrs:{type:"warning",ghost:""},on:{click:t.handleReturn}},[t._v(" 返回")]),e("Button",{staticClass:"header_btn",staticStyle:{"margin-left":"3rem",height:"2.6rem"},attrs:{ghost:""},on:{click:t.handelGoSure}},[t._v(" 确认")])],1)])])},o=[],n={data(){return{is_show:!0,is_use:!1,selected:"",options:[]}},created(){const t={url:"http://122.112.250.253:7774/jbl/api/module-data/goods_check_list/page",post:{direction:"DESC",property:"id",fromClientType:"pc",number:0,sorts:[],rules:[],size:99,specialConditions:[],dynamicFormCode:"goods_check",developmentSystemId:null,debugFlag:!0}};this.axios.post("/api/testdwy",{...t}).then(t=>{this.options=t.data.content.filter(t=>"NOT_APPROVED"===t.status),this.options.forEach(t=>{t.value=t.dynamic_form_value_id,t.text=t.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")}}},a=n,c=(s("f72c"),s("2877")),r=Object(c["a"])(a,i,o,!1,null,"1c1fe307",null);e["default"]=r.exports},f72c:function(t,e,s){"use strict";s("8146")}}]);

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-bc881418.dea490ca.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-d6085eaa.119a371d.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-d8321da8.9a17d452.js


+ 1 - 0
dist/static/js/chunk-f38fb816.28da7dc8.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-f38fb816"],{"12f8":function(t,e,i){"use strict";i("ce85")},"41fa":function(t,e,i){"use strict";i.r(e);var s=function(){var t=this,e=t._self._c;return e("div",{staticStyle:{height:"100vh"}},[e("div",{staticClass:"home_header"},[t._v("选择大屏")]),e("div",{staticClass:"home_header_line"}),e("div",{staticClass:"home_con_body"},[e("div",[e("div",{staticClass:"completion_con",on:{click:t.handlePackage}},[t._m(0)]),e("div",{staticClass:"completion_con",on:{click:t.handleDispatch}},[t._m(1)])])])])},a=[function(){var t=this,e=t._self._c;return e("div",{staticStyle:{display:"flex","align-items":"center",gap:".84rem"}},[e("img",{staticStyle:{width:"3.19rem",height:"3.19rem"},attrs:{src:i("999e"),alt:""}}),e("p",{staticStyle:{"margin-bottom":"0","font-size":"1.13rem",color:"#FFFFFF"}},[t._v("出入库屏")])])},function(){var t=this,e=t._self._c;return e("div",{staticStyle:{display:"flex","align-items":"center",gap:".84rem"}},[e("img",{staticStyle:{width:"3.19rem",height:"3.19rem"},attrs:{src:i("4ec6"),alt:""}}),e("p",{staticStyle:{"margin-bottom":"0","font-size":"1.13rem",color:"#FFFFFF"}},[t._v("发货屏")])])}],c={data(){return{is_show:!0}},mounted(){this.handleShow()},methods:{handlePackage(){this.$router.push({path:"/cms/bigDispatchList",query:{type:2}})},handleDispatch(){this.$router.push({path:"/cms/bigDispatchList",query:{type:1}})},handleShow(){this.is_show=!this.is_show}}},n=c,o=(i("12f8"),i("2877")),h=Object(o["a"])(n,s,a,!1,null,"7dd37d73",null);e["default"]=h.exports},"4ec6":function(t,e,i){t.exports=i.p+"static/img/bzhomefha.5a8eb083.png"},"999e":function(t,e,i){t.exports=i.p+"static/img/bzhomebz.3f043823.png"},ce85:function(t,e,i){}}]);

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-f76f34b0.4de4c1c0.js


+ 35 - 13
src/views/BigScreen/detail.vue

@@ -69,12 +69,14 @@
               <div style="width: 50%">
                 <table class="true_table">
                   <tr style="height: 2rem">
-                    <th style="width: 5rem">产品名称</th>
-                    <th style="width: 4rem">规格型号</th>
+                    <th style="width: 3rem">订单号</th>
+                    <th style="width: 3rem">产品名称</th>
+                    <th style="width: 3rem">规格型号</th>
                     <th style="width: 2rem">包装单号</th>
                     <th style="width: 2rem">已扫到数量</th>
                   </tr>
                                   <tr v-for="(item, index) in tableData" :key="index" @click="handleChoose(item, index)">
+                                    <td>{{ item.order_no }}</td>
                                     <td>
                                       {{ item.product_title}}
                                     </td>
@@ -87,12 +89,14 @@
               <div style="width: 45%;margin-right: 1rem">
                 <table class='error_table'>
                   <tr style="height: 2rem">
-                    <th style="width: 5rem;">产品名称</th>
-                    <th style="width: 4rem;">规格型号</th>
+                    <th style="width: 3rem">订单号</th>
+                    <th style="width: 3rem;">产品名称</th>
+                    <th style="width: 3rem;">规格型号</th>
                     <th style="width: 2rem;">包装单号</th>
                     <th style="width: 2rem;">数量</th>
                   </tr>
                   <tr v-for="(item, index) in error_data" :key="index" @click="handleChoose(item, index)">
+                    <td>{{ item.order_no }}</td>
                     <td>
                       {{ item.box_detail.product_title }}
                     </td>
@@ -324,7 +328,8 @@ export default {
         this.total_num = 0;
         res.data.data.exe_delivery_note_dtl_b.forEach((element, index) => {
           element.out_qty = 0
-          element.product_code = element.material_code
+          element.product_code = element.material_code;
+          element.unit_price = element.settlement_one_price;
           this.total_num = this.total_num + element.this_delivery_qty
           let product_key = this.deelUniqueProductKey(element)
           // if(Object.keys(this.key_tableData).indexOf(product_key) !== -1){
@@ -419,6 +424,11 @@ export default {
     initDataBox (row,type) {
       if(type==1){//入
        let box_n = row.post["defective_order_no_list"];
+       this.text1.forEach((v,index)=>{
+         if(box_n.indexOf(v)!=-1){
+           this.text1.splice(index,1)
+         }
+       })
        this.tableData = this.tableData.filter(v=>box_n.indexOf(v.box_no)==-1)
         this.error_data = this.error_data.filter(v=>box_n.indexOf(v.box_no)==-1)
         this.scan_num = 0;
@@ -431,7 +441,11 @@ export default {
         })
       }else {//出
         // this.$Message.warning(row.post["defective_order_no_list"].toString())
-        this.text1 = row.post["defective_order_no_list"];
+        row.post["defective_order_no_list"].forEach(v=>{
+          if(this.text1.indexOf(v)==-1){
+            this.text1.push(v)
+          }
+        })
         let data = [];
         this.axios.post('/api/testdwy', { ...row }).then(res => {
           if (res.code == 200) {
@@ -515,7 +529,7 @@ export default {
     // handleSureClick () {
     //   this.is_modal = true
     // },
-    handelGoSure () {
+   async handelGoSure () {
       if(this.tableData.length==0&&!this.record_state){
         return
       }
@@ -662,7 +676,8 @@ export default {
       if(this.state){
         this.state = false
         if(this.tableData.length==0&&this.record_state){
-          this.axios.post('/api/testdwydel',{url:`${localStorage.getItem('dwy_url')}jbl/api/module-data/send_goods_out/send_goods_out/${this.record_send_goods.dynamic_form_value_id}`}).then(res=>{
+         await this.axios.post('/api/testdwydel',{url:`${localStorage.getItem('dwy_url')}jbl/api/module-data/send_goods_out/send_goods_out/${this.record_send_goods.dynamic_form_value_id}`}).then(res=>{
+            this.$Message.success(res.msg)
             this.axios.post('/api/testdwy', {
                   url: `${localStorage.getItem('dwy_url')}jbl/api/module-data/send_goods_out_dtl/page`,
                   post: {
@@ -702,11 +717,11 @@ export default {
           })
         }else {
           if(this.record_state){
-            this.axios.post('/api/testdwyget',{url:`${localStorage.getItem('dwy_url')}jbl/api/module-data/send_goods_out/send_goods_out/474061443708694528/${this.record_send_goods.dynamic_form_value_id}`}).then(res=>{
+           await this.axios.post('/api/testdwyget',{url:`${localStorage.getItem('dwy_url')}jbl/api/module-data/send_goods_out/send_goods_out/474061443708694528/${this.record_send_goods.dynamic_form_value_id}`}).then(res=>{
               data.version = res.data.version;
               this.axios.post('/api/testdwyput', {url:`${localStorage.getItem('dwy_url')}jbl/api/module-data/send_goods_out/send_goods_out`,post:data}).then(res => {
                 if (res.code === 200) {
-                  // this.$Message.success(res.msg)
+                  this.$Message.success(res.msg)
                   this.axios.post('/api/testdwy', {
                         url: `${localStorage.getItem('dwy_url')}jbl/api/module-data/send_goods_out_dtl/page`,
                         post: {
@@ -750,9 +765,9 @@ export default {
               })
             })
           }else {
-            this.axios.post('/api/testdwy', {url:`${localStorage.getItem('dwy_url')}jbl/api/module-data/send_goods_out/send_goods_out`,post:data}).then(res => {
+           await this.axios.post('/api/testdwy', {url:`${localStorage.getItem('dwy_url')}jbl/api/module-data/send_goods_out/send_goods_out`,post:data}).then(res => {
               if (res.code === 200) {
-                // this.$Message.success(res.msg)
+                this.$Message.success(res.msg)
                 this.axios.post('/api/testdwy', {
                       url: `${localStorage.getItem('dwy_url')}jbl/api/module-data/send_goods_out_dtl/page`,
                       post: {
@@ -797,7 +812,14 @@ export default {
           }
         }
       }
-     },
+     let data1 = {
+       url: `${localStorage.getItem('dwy_url')}jbl/api/module-data/box_orders/box_orders/diy/update_delivery_status`,
+       post: {
+         defective_order_no_list:this.text1
+       }
+     }
+      await this.axios.post('/api/testdwy',data1)
+   },
     handleReturn() {
       if (this.isFullScreen) {
         this.handleFullScreenClick()

+ 227 - 133
src/views/page/Dispatch/detail.vue

@@ -157,7 +157,7 @@ color: #ABDFFF;">展开</div>
                   :action="$store.state.ip + '/api/upload'"
               >
                 <div class="upd_file">
-                  <Icon type="ios-cloud-upload-outline" class="ico" size="30" />
+                  <Icon type="ios-cloud-upload-outline" class="ico" size="30" color="black"/>
                 </div>
               </Upload>
             </div>
@@ -284,7 +284,9 @@ export default {
       state: true,
       is_error: false,
       error_data:[],
-      text1:[]
+      text1:[],
+      record_state:false,//false未生成发货出库单;true已经生成发货出库单
+      record_send_goods:{}
     }
   },
   mounted() {
@@ -344,9 +346,9 @@ export default {
     initData(row) {
       this.axios.post('/api/testdwyget', { ...row }).then(res => {
         // this.tableData.push(...res.data.data.exe_delivery_note_dtl_b);
-        res.data.data.exe_delivery_note_dtl_b.forEach(c=>{
-          c.this_delivery_qty -= c.out_qty_total?c.out_qty_total:0
-        })
+        // res.data.data.exe_delivery_note_dtl_b.forEach(c=>{
+        //   c.this_delivery_qty -= c.out_qty_total?c.out_qty_total:0
+        // })
         this.data = res.data;
         this.detail = res.data.data.exe_delivery_note_b;
         this.modalData.attachment = this.detail.attachment?this.detail.attachment:{attachFile: []};
@@ -355,12 +357,15 @@ export default {
         this.modalData.carrier_phone = this.detail.carrier_phone;
         this.modalData.plate_no = this.detail.plate_no;
         res.data.data.exe_delivery_note_dtl_b.forEach((element, index) => {
-          element.out_qty = 0
-          element.product_code = element.material_code
+          element.out_qty = 0;
+          element.product_code = element.material_code;
+          element.sure_id = null;
+          element.dynamic_form_value_id = null;
+          element.unit_price = element.settlement_one_price;
           this.total_num = this.total_num + element.this_delivery_qty
           // this.transport_total = this.transport_total + element.out_qty
-          let product_key = this.deelUniqueProductKey(element)
-          if(Object.keys(this.key_tableData).indexOf(product_key) !== -1){
+          let product_key = this.deelUniqueProductKey(element) //把每个产品的key值组合起来
+          if(Object.keys(this.key_tableData).indexOf(product_key) !== -1){//如过有相同的产品合并未发货数量相加
             this.key_tableData[product_key].this_delivery_qty += element.this_delivery_qty
           } else{
             this.key_tableData[product_key] = element
@@ -369,47 +374,85 @@ export default {
           //   this.is_box_data.push(this.deelUniqueKey(element));
           // }
         })
-        for (let key in this.key_tableData) {
+        for (let key in this.key_tableData) { //tableData变成了相同产品未发货数量合并后的数据
           this.tableData.push(this.key_tableData[key])
         }
-        // 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))
+        // this.key_tableData = [];
+        this.axios.post('/api/testdwy', {
+              url: 'http://122.112.250.253:7774/jbl/api/module-data/send_goods_out_dtl/page',
+              post: {
+                debugFlag: true,
+                developmentSystemId: null,
+                direction: "DESC",
+                dynamicFormCode: "send_goods_out",
+                dynamicFormTable: null,
+                fromClientType: "pc",
+                ignoreField: true,
+                number: 0,
+                property: "id",
+                rules: [{
+                  field: "bus_id",
+                  option: "LIKE_ANYWHERE",
+                  values: [this.$route.query.ckId]
+                }],
+                size: 999,
+                sorts: [],
+                specialConditions: [],
+                workflowSearchBean: {}
+              }
+            }
+        ).then(req => {
+          this.record_state = req.data.content.length==0?false:true;
+          if(this.record_state){
+            this.record_send_goods = req.data.content[0].send_goods_out;
+            req.data.content.forEach(v=>{
+              this.key_tableData[this.deelUniqueProductKey(v)].out_qty += v.out_qty
+              this.key_tableData[this.deelUniqueProductKey(v)].this_delivery_qty -= v.out_qty
+              this.key_tableData[this.deelUniqueProductKey(v)].dynamic_form_value_id = v.dynamic_form_value_id;
+              this.key_tableData[this.deelUniqueProductKey(v)].sure_id = v.id;
+              this.scan_num += v.out_qty
+            })
+          }
+          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)
+          }
+          let text1 = localStorage.getItem('text') ? JSON.parse(localStorage.getItem('text')) : []
+          text.forEach(v => {
+            if (text1.indexOf(v) === -1) {
+              text1.push(v)
+            }
           })
-        //   // console.log(text)
-        }
-        let text1 = localStorage.getItem('text') ? JSON.parse(localStorage.getItem('text')) : []
-        text.forEach(v => {
-          if (text1.indexOf(v) === -1) {
-            text1.push(v)
+          localStorage.setItem('text', JSON.stringify(text1));
+          // text1 = ['BZ01252','BZ01251','BZ01253']
+          const dataBox = {
+            url: 'http://122.112.250.253:7774/jbl/api/module-data/box_orders/box_orders/diy/defective_order_no_list',
+            post: { "defective_order_no_list":text1}
           }
+          // const dataBox = {
+          //   url: 'http://122.112.250.253:7774/jbl/api/module-data/box_orders/box_orders/diy/defective_order_no_list',
+          //   post: { "defective_order_no_list":['BZ00025']}
+          // }
+          this.initDataBox(dataBox)
         })
-        localStorage.setItem('text', JSON.stringify(text1));
-        // text1 = ['BZ00520']
-        const dataBox = {
-          url: 'http://122.112.250.253:7774/jbl/api/module-data/box_orders/box_orders/diy/defective_order_no_list',
-          post: { "defective_order_no_list":text1}
-        }
-        // const dataBox = {
-        //   url: 'http://122.112.250.253:7774/jbl/api/module-data/box_orders/box_orders/diy/defective_order_no_list',
-        //   post: { "defective_order_no_list":['BZ00025']}
-        // }
-        this.initDataBox(dataBox)
+        // let ji = ['\"425A3030303235\"']
+        // console.log(JSON.stringify(ji))
+
       })
     },
     // 扫描数据获取
     initDataBox (row) {
       this.$Message.warning(row.post["defective_order_no_list"].toString())
       this.text1 = row.post["defective_order_no_list"];
-      console.log(this.text1)
+      // console.log(this.text1)
       this.axios.post('/api/testdwy', { ...row }).then(res => {
         if (res.code == 200) {
           this.$Message.success('请求成功!')
@@ -429,7 +472,7 @@ export default {
               "box_id": element.box_orders.id,
               'box_detail': element
             }
-            this.scan_data.push(object)
+            this.scan_data.push(object)//扫描数据处理
           })
           this.deelTableData()
         }
@@ -454,14 +497,15 @@ export default {
         // console.log(this.deelUniqueProductKey(element),3)
         // console.log(this.detail.order_no)
         if (this.detail.order_no.indexOf(element.order_no)!=-1&&Object.keys(this.key_tableData).indexOf(this.deelUniqueProductKey(element)) !== -1 && (this.key_tableData[this.deelUniqueProductKey(element)].this_delivery_qty - element.box_num) >= 0) {
+          this.key_tableData[this.deelUniqueProductKey(element)].this_delivery_qty -= element.box_num*1
+          this.key_tableData[this.deelUniqueProductKey(element)].out_qty += element.box_num*1;
           let table_data_detail = JSON.parse(JSON.stringify(this.key_tableData[this.deelUniqueProductKey(element)]))
+          table_data_detail.out_qty = element.box_num*1;
           table_data_detail.box_orders = element.box_id
           table_data_detail.box_orders_show = element.box_no
           table_data_detail.box_detail = element.box_detail
-          table_data_detail.this_delivery_qty = element.box_num
-          table_data_detail.out_qty = element.box_num
-          this.key_tableData[this.deelUniqueProductKey(element)].this_delivery_qty -= element.box_num*1
-          this.key_tableData[this.deelUniqueProductKey(element)].out_qty += element.box_num*1;
+          // table_data_detail.this_delivery_qty = element.box_num
+          // table_data_detail.out_qty = element.box_num
           this.scan_num += element.box_num*1
           // is_scan_key[this.deelUniqueProductKey(element)]=1;
           // table_data_detail.this_delivery_qty =  this.key_tableData[this.deelUniqueProductKey(element)].this_delivery_qty;
@@ -479,85 +523,115 @@ export default {
       //   // }
       // })
       // this.tableData = new_table_data;
+      this.$forceUpdate();
     },
     handleSureClick () {
       this.is_modal = true
     },
     handelGoSure () {
-      this.tableData.forEach((element, index) => {
-        element.item_num = (index + 1)
-      })
+      // this.tableData.forEach((element, index) => {
+      //   element.item_num = (index + 1)
+      // })
       const date = new Date()
       // eslint-disable-next-line camelcase
       const now_time = date.toISOString()
-      let data = {
-        // auditInfo: null,
-        bizId: -1,
-        bizTypeEk: 'LOWCODE',
-        // businessType: null,
-        // createdBy: "473698106823094272",
-        createdDate: now_time,
-        dynamicFormId: '474057887278641152',
-        // extDataId: null,
-        // id: "491138208411951104",
-        // lastModifiedBy: "473698106823094272",
-        // lastModifiedDate: now_time,
-        // requestId: null,
-        showModelId: '474061442555260928',
-        version: 1,
-        // versionNo: null,
-        data: {
-          send_goods_out: {},
-          send_goods_out_product: []
+      let data = {}
+      if(this.record_state){
+        data = {
+          // auditInfo: null,
+          bizId: this.record_send_goods.dynamic_form_value_id,
+          id: this.record_send_goods.dynamic_form_value_id,
+          bizTypeEk: 'LOWCODE',
+          // businessType: null,
+          // createdBy: "473698106823094272",
+          createdDate: now_time,
+          dynamicFormId: '474057887278641152',
+          // extDataId: null,
+          // id: "491138208411951104",
+          // lastModifiedBy: "473698106823094272",
+          // lastModifiedDate: now_time,
+          // requestId: null,
+          showModelId: '474061442555260928',
+          version: 1,
+          // versionNo: null,
+          data: {
+            send_goods_out: {},
+            send_goods_out_product: []
+          }
+        }
+
+        data.data.send_goods_out = this.record_send_goods;
+      }else {
+        data ={
+          // auditInfo: null,
+          bizId: -1,
+          bizTypeEk: 'LOWCODE',
+          // businessType: null,
+          // createdBy: "473698106823094272",
+          createdDate: now_time,
+          dynamicFormId: '474057887278641152',
+          // extDataId: null,
+          // id: "491138208411951104",
+          // lastModifiedBy: "473698106823094272",
+          // lastModifiedDate: now_time,
+          // requestId: null,
+          showModelId: '474061442555260928',
+          version: 1,
+          // versionNo: null,
+          data: {
+            send_goods_out: {},
+            send_goods_out_product: []
+          }
+        }
+        data.data.send_goods_out = {
+          send_goods_out_no: null,
+          in_out_type: 'CK007',
+          box_title: 'WH05001',
+          out_time: now_time,
+          out_depart: '481280388644478976',
+          out_employee_id: this.employee_code,
+          expect_date_delivery: this.detail.expect_date_delivery,
+          expect_date_arrival: this.detail.expect_date_arrival,
+          delivery_method_dk: this.detail.delivery_method_dk,
+          express_company: null,
+          express_no: null,
+          carrier: this.modalData.carrier, // 司机姓名
+          carrier_phone: this.modalData.carrier_phone, // 司机电话
+          plate_no: this.modalData.plate_no, // 车牌
+          id_number: this.modalData.id_number, // 身份证
+          attachment: this.modalData.attachment,
+          area_selection: this.detail.area_selection,
+          detailed_address: this.detail.detailed_address,
+          contact: this.detail.contact,
+          contact_way: this.detail.contact_way,
+          status: 'NOT_APPROVED',
+          oa_id: null,
+          oa_time: null,
+          remark: null,
+          order_no: this.detail.order_no,
+          site: null,
+          in_out_type_show: '成品发货出库',
+          box_title_show: '成品仓',
+          out_depart_show: '仓储部',
+          out_employee_id_show: this.name,
+          delivery_method_dk_show: this.detail.delivery_method_dk_show,
+          area_selection_show: this.detail.area_selection_show,
+          // attachment: null,
+          // dynamic_form_value_id: this.detail.dynamic_form_value_id,
+          // expect_date_arrival_lt: this.detail.expect_date_arrival_lt,
+          // expect_date_delivery_lt: this.detail.expect_date_delivery_lt,
+          // id: "491138208583917568"
+          // main_table_id: null,
+          // oa_id_show: null,
+          // oa_time_lt: null,
+          // out_time_lt: now_time,
+          // request_id: null,
+          // send_goods_out_no: "FCK2023091700099",
+          // site_show: this.detail.site_show,
+          // status_show: '待审核'
         }
       }
-      data.data.send_goods_out = {
-        send_goods_out_no: null,
-        in_out_type: 'CK007',
-        box_title: 'WH05001',
-        out_time: now_time,
-        out_depart: '481280388644478976',
-        out_employee_id: this.employee_code,
-        expect_date_delivery: this.detail.expect_date_delivery,
-        expect_date_arrival: this.detail.expect_date_arrival,
-        delivery_method_dk: this.detail.delivery_method_dk,
-        express_company: null,
-        express_no: null,
-        carrier: this.modalData.carrier, // 司机姓名
-        carrier_phone: this.modalData.carrier_phone, // 司机电话
-        plate_no: this.modalData.plate_no, // 车牌
-        id_number: this.modalData.id_number, // 身份证
-        attachment: this.modalData.attachment,
-        area_selection: this.detail.area_selection,
-        detailed_address: this.detail.detailed_address,
-        contact: this.detail.contact,
-        contact_way: this.detail.contact_way,
-        status: 'NOT_APPROVED',
-        oa_id: null,
-        oa_time: null,
-        remark: null,
-        order_no: this.detail.order_no,
-        site: null,
-        in_out_type_show: '成品发货出库',
-        box_title_show: '成品仓',
-        out_depart_show: '仓储部',
-        out_employee_id_show: this.name,
-        delivery_method_dk_show: this.detail.delivery_method_dk_show,
-        area_selection_show: this.detail.area_selection_show,
-        // attachment: null,
-        // dynamic_form_value_id: this.detail.dynamic_form_value_id,
-        // expect_date_arrival_lt: this.detail.expect_date_arrival_lt,
-        // expect_date_delivery_lt: this.detail.expect_date_delivery_lt,
-        // id: "491138208583917568"
-        // main_table_id: null,
-        // oa_id_show: null,
-        // oa_time_lt: null,
-        // out_time_lt: now_time,
-        // request_id: null,
-        // send_goods_out_no: "FCK2023091700099",
-        // site_show: this.detail.site_show,
-        // status_show: '待审核'
-      }
+      // return console.log(this.new_table_data,123)
       this.new_table_data.forEach((element,index) =>{
         let box_detail = {
           item_num: (index + 1),
@@ -578,7 +652,7 @@ export default {
           bus_id: this.detail.id,
           bus_item_id: element.id,
           bus_item_no: element.item_no,
-          box_orders_product_id:element.box_detail.id,
+          box_orders_product_id: element.box_detail.id,
           order_no: element.box_detail.order_no,
           out_qty: element.out_qty,
           this_delivery_qty: element.out_qty,
@@ -590,10 +664,10 @@ export default {
           dealer_name: element.box_detail.dealer_name,
           dealer_no: element.box_detail.dealer_no,
           box_orders: element.box_detail.box_orders.id,
-          box_orders_show: element.box_detail.box_orders.defective_order_no
+          box_orders_show: element.box_detail.box_orders.defective_order_no,
           // site_show: element.box_detail.site_show
-          // dynamic_form_value_id: element.box_detail.dynamic_form_value_id,
-          // id: "491138208592306176"
+          dynamic_form_value_id: element.dynamic_form_value_id,
+          id:element.sure_id
           // lineId: "29E776DE",
           // mainKey: "29E776DE",
           // main_table_id: "491138208583917568",
@@ -619,20 +693,40 @@ export default {
       }
       if(this.state){
         this.state = false
-        this.axios.post('/api/testdwy', data2).then(res => {
-          if (res.code === 200) {
-            this.axios.post('/api/testdwy', data1).then(req=>{
-              if(req.code === 200){
-                this.is_modal = false
-                this.$router.go(-1)
+        if(this.record_state){
+          this.axios.post('/api/testdwyget',{url:`http://122.112.250.253:7774/jbl/api/module-data/send_goods_out/send_goods_out/474061443708694528/${this.record_send_goods.dynamic_form_value_id}`}).then(res=> {
+            data.version = res.data.version;
+            this.axios.post('/api/testdwyput', data2).then(res => {
+              if (res.code === 200) {
+                this.axios.post('/api/testdwy', data1).then(req=>{
+                  if(req.code === 200){
+                    this.is_modal = false
+                    this.$router.go(-1)
+                  }
+                })
+                this.$Message.success(res.msg)
               }
+              setTimeout(()=>{
+                this.state = true
+              },5000)
             })
-            this.$Message.success(res.msg)
-          }
-          setTimeout(()=>{
-            this.state = true
-          },5000)
-        })
+          })
+        }else {
+          this.axios.post('/api/testdwy', data2).then(res => {
+            if (res.code === 200) {
+              this.axios.post('/api/testdwy', data1).then(req=>{
+                if(req.code === 200){
+                  this.is_modal = false
+                  this.$router.go(-1)
+                }
+              })
+              this.$Message.success(res.msg)
+            }
+            setTimeout(()=>{
+              this.state = true
+            },5000)
+          })
+        }
       }
       // console.log(JSON.stringify(this.data))
     },
@@ -640,10 +734,10 @@ export default {
       localStorage.removeItem('fyy_target')
       this.$router.push('/cms/finish')
     },
-    handleChoose(item, index) {
-      item.is_choose = !item.is_choose
-      this.tableData.splice(index, 1, item)
-    },
+    // 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'))

+ 10 - 2
src/views/page/Finish/index.vue

@@ -5,7 +5,7 @@
       <div style="font-size: 1.3rem; font-weight: bold ; color: #fff;margin-bottom:1rem">发货单号</div>
       <div class="secd_input_r">
         <b-form-select id="input-3" :options="options" v-model="selected" class="inp select_list" style="height: 3rem"
-                       required placeholder="请选择站点"></b-form-select>
+                       required @change="handleSelect"></b-form-select>
       </div>
       <div class="bdy_btn">
         <Button
@@ -34,6 +34,7 @@
 export default {
   data () {
     return {
+      id:'',
       is_show: true,
       is_use: false,
       selected: '',
@@ -54,11 +55,18 @@ export default {
     })
   },
   methods: {
+    handleSelect(e){
+      if(e){
+        this.id = this.options.find(v=>v.dynamic_form_value_id==e).id;
+      }else {
+        this.id = '';
+      }
+    },
     handelGoSure () {
       if (!this.selected) {
         return this.$Message.warning('请先选择发货单号!')
       }
-      this.$router.push({ path: '/cms/dispatch/detail', query: { id: this.selected } })
+      this.$router.push({ path: '/cms/dispatch/detail', query: { id: this.selected,ckId:this.id } })
     },
     handleReturn () {
       this.$router.push('/cms/home')

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

@@ -55,7 +55,7 @@
               </div>
               <div class="secd_flex_s">
                 <span>未包数量:</span>
-                <span>{{ item.production_num_total-item.box_num_total }}张</span>
+                <span>{{ item.quality_num_total - item.box_num_total }}张</span>
               </div>
             </div>
           </div>
@@ -170,7 +170,7 @@ export default {
         res.data.content.forEach(v => {
           v.is_choose = false
           v.no = v.exe_sale_order_b.no
-          v.un_box_num = v.production_num_total - v.box_num_total
+          v.un_box_num = v.quality_num_total - v.box_num_total
           this.product_total += v.production_num_total
           this.box_num += v.box_num_total
         })

+ 14 - 1
src/views/page/Package/detailed.vue

@@ -18,7 +18,7 @@
               <div class="secd_input">
                 <div class="secd_input_l">包装数量:</div>
                 <div class="secd_input_r">
-                  <input type="text" v-model="item.un_box_num" @on-change="handleChangeNumber($event, index)"
+                  <input type="text" v-model="item.un_box_num" @change="($event)=>handleChangeNumber($event, index)"
                     placeholder="请输入数量">
                 </div>
               </div>
@@ -196,6 +196,16 @@ export default {
     this.initData(id)
   },
   methods: {
+    handleChangeNumber(e,index){
+      let num = 0;
+      num = this.list[index].quality_num_total-this.list[index].box_num_total;
+      if(e.target.value>num){
+        this.$Message.warning('包装数量不能大于待包装数量!')
+        this.$nextTick(()=>{
+          this.list[index].un_box_num = num;
+        })
+      }
+    },
     initData(id) {
       if (id) {
         this.list = JSON.parse(localStorage.getItem(id + ''))
@@ -238,6 +248,9 @@ export default {
       this.$router.go(-1)
     },
     handleSure() {
+      if(this.list.some(v=>!v.un_box_num*1)){
+        return this.$Message.warning('包装数量不能为空!')
+      }
       let box_orders_products = [];
       let box_orders_label_products = []
       let team_id = '';

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff