Skip to content

F
factory_front
Commit 5ac50c9e by qinjianhui
Options

feat: 拣胚完成

parent 71f385c2
Showing with 238 additions and 122 deletions
public/iconfont/demo_index.html
......@@ -55,6 +55,12 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe605;</span>
<div class="name">提示</div>
<div class="code-name">&amp;#xe605;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe62e;</span>
<div class="name">查看详情</div>
<div class="code-name">&amp;#xe62e;</div>
......@@ -132,9 +138,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1729077025378') format('woff2'),
url('iconfont.woff?t=1729077025378') format('woff'),
url('iconfont.ttf?t=1729077025378') format('truetype');
src: url('iconfont.woff2?t=1774496872018') format('woff2'),
url('iconfont.woff?t=1774496872018') format('woff'),
url('iconfont.ttf?t=1774496872018') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -161,6 +167,15 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-tishi"></span>
<div class="name">
提示
</div>
<div class="code-name">.icon-tishi
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-chakanxiangqing"></span>
<div class="name">
查看详情
......@@ -279,6 +294,14 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-tishi"></use>
</svg>
<div class="name">提示</div>
<div class="code-name">#icon-tishi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-chakanxiangqing"></use>
</svg>
<div class="name">查看详情</div>
......
public/iconfont/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 4462827 */
src: url('iconfont.woff2?t=1729077025378') format('woff2'),
url('iconfont.woff?t=1729077025378') format('woff'),
url('iconfont.ttf?t=1729077025378') format('truetype');
src: url('iconfont.woff2?t=1774496872018') format('woff2'),
url('iconfont.woff?t=1774496872018') format('woff'),
url('iconfont.ttf?t=1774496872018') format('truetype');
}
.iconfont {
......@@ -13,6 +13,10 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-tishi:before {
content: "\e605";
}
.icon-chakanxiangqing:before {
content: "\e62e";
}
......
public/iconfont/iconfont.js
window._iconfont_svg_string_4462827='<svg><symbol id="icon-chakanxiangqing" viewBox="0 0 1024 1024"><path d="M383.6 62.8h256.3c213.6 0 320.4 106.8 320.4 320.4v256.3c0 213.6-106.8 320.4-320.4 320.4H383.6C170 959.8 63.2 853 63.2 639.4V383.2C63.2 169.6 170 62.8 383.6 62.8z" fill="#2084FE" ></path><path d="M254.1 515.3H416v-53.2H254.1zM254.1 358h363.1v53.2H254.1z" fill="#FFFFFF" opacity=".7" ></path><path d="M700.5 663.3c13.9-20.8 20.8-43.9 20.8-71.7 0-71.7-57.8-129.5-127.2-129.5S466.8 520 466.8 591.6 524.7 721 594 721c25.5 0 50.8-9.3 71.7-23.1l71.7 74 34.7-34.6-71.6-74z m-108.7 9.2c-41.7 0-76.3-34.7-76.3-78.6 0-43.9 34.7-78.6 76.3-78.6 41.7 0 76.3 34.7 76.3 78.6 0 41.7-34.7 78.6-76.3 78.6z" fill="#FFFFFF" ></path><path d="M254.1 254h363.1v53.2H254.1z" fill="#FFFFFF" opacity=".7" ></path></symbol><symbol id="icon-baojiachaxun" viewBox="0 0 1024 1024"><path d="M0 0m178.086957 0l667.826086 0q178.086957 0 178.086957 178.086957l0 667.826086q0 178.086957-178.086957 178.086957l-667.826086 0q-178.086957 0-178.086957-178.086957l0-667.826086q0-178.086957 178.086957-178.086957Z" fill="#2E7BFC" ></path><path d="M790.327652 721.363478l23.730087 23.730087a42.073043 42.073043 0 0 1 0 59.481044l-9.48313 9.48313a42.073043 42.073043 0 0 1-59.481044 0l-23.730087-23.730087a42.073043 42.073043 0 0 1 0-59.503304l9.46087-9.46087a42.073043 42.073043 0 0 1 59.503304 0zM505.499826 226.081391c154.312348 0 279.418435 125.106087 279.418435 279.418435 0 154.312348-125.106087 279.418435-279.418435 279.418435-154.312348 0-279.418435-125.106087-279.418435-279.418435 0-154.312348 125.106087-279.418435 279.418435-279.418435z m-100.797217 158.764522a19.300174 19.300174 0 0 0-0.24487 25.377391l1.847652 1.869913 44.076522 39.201392h-58.278956l-2.626783 0.178087a19.300174 19.300174 0 0 0 0.200348 38.288695l2.426435 0.133566h84.902956v38.622608h-61.751652l-2.604522 0.178087a19.300174 19.300174 0 0 0 0.200348 38.288696l2.404174 0.133565h61.751652l0.022261 83.656348 0.178087 2.604522a19.300174 19.300174 0 0 0 38.288696-0.200348l0.155826-2.404174-0.044522-83.656348h61.796174l2.626782-0.178087a19.300174 19.300174 0 0 0-0.200347-38.288696l-2.426435-0.133565h-61.796174v-38.622608h84.969739l2.626783-0.178087a19.300174 19.300174 0 0 0-0.222609-38.288696l-2.404174-0.133565h-58.323478l44.121043-39.179131 2.003478-2.070261a19.300174 19.300174 0 0 0-25.577739-28.404869l-2.070261 1.602782-64.400695 57.210435-64.378435-57.210435-2.270609-1.736347a19.300174 19.300174 0 0 0-24.976695 3.33913z" fill="#FFFFFF" ></path></symbol><symbol id="icon-caozuorizhi" viewBox="0 0 1024 1024"><path d="M312.416187 5.855995C376.992127 1.951998 443.520064 0 512 0c68.479936 0 135.007873 1.951998 199.583813 5.855995a319.9997 319.9997 0 0 1 298.14372 279.359738 1811.582302 1811.582302 0 0 1 0 453.535574 319.9997 319.9997 0 0 1-298.14372 279.359739A3304.316902 3304.316902 0 0 1 512 1023.99904c-68.479936 0-135.007873-1.951998-199.583813-5.855995a319.9997 319.9997 0 0 1-298.14372-279.359738 1811.582302 1811.582302 0 0 1 0-453.535574A319.9997 319.9997 0 0 1 312.416187 5.887994z" fill="#40C791" ></path><path d="M384.00012 298.65572A85.34392 85.34392 0 0 0 469.34404 383.99964h85.31192A85.34392 85.34392 0 0 0 639.99988 298.65572h42.65596A85.34392 85.34392 0 0 1 767.99976 383.99964v298.65572A85.34392 85.34392 0 0 1 682.65584 767.99928H341.34416A85.34392 85.34392 0 0 1 256.00024 682.65536V383.99964a85.34392 85.34392 0 0 1 85.34392-85.34392H384.00012z m0 1.311999h255.99976-255.99976z m149.34386 169.375841a21.34398 21.34398 0 1 0 0 42.65596h127.99988a21.34398 21.34398 0 0 0 0-42.65596h-127.99988z m0 127.99988a21.34398 21.34398 0 1 0 0 42.65596h127.99988a21.34398 21.34398 0 0 0 0-42.65596h-127.99988z m-140.479868-119.167888l-15.103986-15.103986a21.34398 21.34398 0 0 0-30.175972 30.207972l30.175972 30.143971a21.27998 21.27998 0 0 0 30.175972 0l60.319943-60.351943a21.34398 21.34398 0 1 0-30.175972-30.143972l-45.247957 45.247958z m0 127.99988l-15.103986-15.103986a21.34398 21.34398 0 0 0-30.175972 30.207972l30.175972 30.143971a21.27998 21.27998 0 0 0 30.175972 0l60.319943-60.351943a21.34398 21.34398 0 1 0-30.175972-30.143972l-45.247957 45.247958zM469.31204 255.99976h85.31192a42.65596 42.65596 0 1 1 0 85.34392h-85.31192a42.65596 42.65596 0 1 1 0-85.34392z" fill="#FFFFFF" ></path></symbol><symbol id="icon-querenshenhexunjia" viewBox="0 0 1024 1024"><path d="M474.500517 639.29203a320.016772 320.016772 0 0 0 93.819328 378.808334 51.976684 51.976684 0 0 1-53.777507-7.16798l-72.950971-58.120668-65.323958 58.120668c-9.321905 8.121357-21.327389 12.535138-33.650666 12.429207a50.140551 50.140551 0 0 1-33.368184-12.287966L243.995222 952.952957l-65.994852 58.615011a50.987997 50.987997 0 0 1-33.544735 12.429207 50.140551 50.140551 0 0 1-33.438805-12.287966L34.499524 943.595742a35.310247 35.310247 0 0 1-6.249914-7.06205A67.407262 67.407262 0 0 1 0.001412 882.756186V51.41172C0.001412 23.057592 23.023694 0 50.742238 0h794.480567c28.036336 0 50.776136 22.84573 50.776136 51.41172V474.569725a319.981462 319.981462 0 0 0-421.498424 164.686994zM127.612647 227.397993h333.575907c14.088789 0 25.211517-11.334589 25.211517-25.282137a25.458688 25.458688 0 0 0-25.211517-25.282137H127.612647a25.070276 25.070276 0 0 0-25.211517 24.964345v0.317792c0 13.559135 11.263969 25.282137 25.211517 25.282137z m231.423361 227.327373a24.752483 24.752483 0 0 0 24.964345-25.211516 25.423378 25.423378 0 0 0-24.964345-25.282138H127.365475a24.823104 24.823104 0 0 0-24.964345 24.717174v0.564964c0 13.488515 11.193348 25.211517 24.964345 25.211516h231.670533z m-26.235514 176.833719a25.176206 25.176206 0 0 0-24.646552-25.211516H127.047683a24.929035 24.929035 0 0 0-24.646553 25.211516c0 13.559135 11.016797 25.282137 24.646553 25.282138h181.141569a24.964345 24.964345 0 0 0 24.611242-25.282138zM766.09254 511.998588a255.999294 255.999294 0 1 1 0 511.998587 255.999294 255.999294 0 0 1 0-511.998587z m145.195738 206.105914a26.553306 26.553306 0 0 0-37.605414-37.428862l-131.001018 131.001017-84.25025-84.21494a26.447375 26.447375 0 1 0-37.428862 37.428863l102.999992 103.035302a26.517996 26.517996 0 0 0 37.428862 0l149.85669-149.82138z" fill="#389AFB" ></path></symbol><symbol id="icon-shenhe" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#00CD82" ></path><path d="M512 744.727273h-211.549091a16.989091 16.989091 0 0 1-16.989091-16.989091V318.836364a16.989091 16.989091 0 0 1 16.989091-16.989091h335.127273a16.989091 16.989091 0 0 1 16.989091 16.989091v144.756363a17.221818 17.221818 0 0 0 34.210909 0V318.836364a51.2 51.2 0 0 0-50.967273-50.967273H300.450909a51.2 51.2 0 0 0-50.967273 50.967273v408.203636a51.2 51.2 0 0 0 50.967273 51.2H512A17.221818 17.221818 0 0 0 512 744.727273z m0 0" fill="#FFFFFF" ></path><path d="M596.945455 361.425455H330.007273a16.989091 16.989091 0 1 0 0 33.978181h266.938182a16.989091 16.989091 0 0 0 0-33.978181z m0 84.945454H330.007273a17.221818 17.221818 0 1 0 0 34.210909h266.938182a17.221818 17.221818 0 0 0 0-34.210909z m-42.821819 85.178182h-224.116363a16.989091 16.989091 0 1 0 0 33.978182h224.349091a16.989091 16.989091 0 0 0 16.989091-16.989091 17.454545 17.454545 0 0 0-17.221819-16.989091z m220.16 262.050909h-184.087272a15.592727 15.592727 0 1 0 0 31.185455h184.087272a16.756364 16.756364 0 0 0 17.221819-16.058182 16.290909 16.290909 0 0 0-17.221819-15.127273z m-4.887272-122.181818h-36.072728c-4.887273-9.774545 0-28.625455 16.290909-50.734546a84.014545 84.014545 0 0 0 13.265455-43.985454 78.196364 78.196364 0 0 0-82.152727-74.007273 77.498182 77.498182 0 0 0-81.687273 74.007273 83.316364 83.316364 0 0 0 13.265455 43.752727v1.629091c15.127273 22.109091 21.178182 40.494545 16.523636 50.734545h-34.676364a35.607273 35.607273 0 0 0-37.003636 34.443637v54.458182a14.894545 14.894545 0 0 0 15.36 13.963636H791.272727a14.429091 14.429091 0 0 0 15.127273-13.498182v-56.32a35.607273 35.607273 0 0 0-37.003636-34.443636z m3.025454 71.447273h-181.061818v-37.003637a2.792727 2.792727 0 0 1 2.792727-2.792727h48.64a7.447273 7.447273 0 0 0 4.887273-1.861818c26.530909-19.549091 25.134545-53.76-4.421818-96.581818a57.250909 57.250909 0 0 1-9.309091-29.556364 48.174545 48.174545 0 0 1 95.650909 0 54.225455 54.225455 0 0 1-9.541818 30.021818c-29.323636 42.821818-30.487273 77.032727-4.189091 96.581818a7.447273 7.447273 0 0 0 4.887273 1.861818H768a2.792727 2.792727 0 0 1 2.792727 2.792728v37.003636z m-215.272727-126.37091h-227.141818a17.221818 17.221818 0 1 0 0 34.21091h227.141818a17.221818 17.221818 0 1 0 0-34.21091z m0 0" fill="#FFFFFF" ></path></symbol><symbol id="icon-shenhe1" viewBox="0 0 1024 1024"><path d="M0.000608 512c0 282.766309 229.228574 512 512 512 282.766309 0 512-229.233691 512-512C1024.000608 229.228574 794.766917 0 512.000608 0 229.229182 0 0.000608 229.228574 0.000608 512z m0 0" fill="#FF7A65" ></path><path d="M708.338383 848.605944h-392.67555c-4.845762 0-8.71009-3.934943-8.710091-8.71009v-37.856297c0-4.845762 3.94006-8.71009 8.710091-8.710091h392.754351c4.845762 0 8.70395 3.934943 8.70395 8.710091v37.856297c0 4.845762-3.936989 8.71009-8.782751 8.71009z m-383.966484-17.490794h375.262534v-20.366527H324.371899v20.366527z m0 0" fill="#FFFFFF" ></path><path d="M739.601989 810.064997H284.38797c-28.925154 0-52.473407-23.547229-52.473407-52.473406v-72.007916c0-28.925154 23.548252-52.472383 52.473407-52.472383h455.219136c28.925154 0 52.473407 23.547229 52.473406 52.472383v72.007916c0 28.927201-23.548252 52.473407-52.478523 52.473406zM284.38797 668.093904c-9.614769 0-17.491818 7.870909-17.491818 17.489771v72.007916c0 9.614769 7.877049 17.491818 17.491818 17.491817h455.219136c9.613745 0 17.490794-7.877049 17.490794-17.491817v-72.007916c0-9.618862-7.877049-17.489771-17.490794-17.489771H284.38797z m0 0" fill="#FFFFFF" ></path><path d="M610.890987 664.989956H413.188007c-5.529388 0-10.829535-2.652632-14.082899-7.116669-3.331141-4.473247-4.24196-10.302488-2.575878-15.602636l55.426916-177.55853c-54.287881-23.697668-90.862891-78.291543-90.862891-138.414806 0-83.214059 67.693294-150.908376 150.908376-150.908376 83.214059 0 150.908376 67.694318 150.908377 150.908376 0 60.123263-36.57501 114.789799-90.862892 138.414806l55.503671 177.637331c1.665059 5.300148 0.677486 11.051611-2.574854 15.597519-3.331141 4.391376-8.560675 7.044008-14.088016 7.044008h0.00307z m-173.923441-34.981589h150.147996l-53.383203-170.747856a17.901175 17.901175 0 0 1 1.214767-13.400296 17.564479 17.564479 0 0 1 10.44781-8.558628c48.610102-14.610969 82.610258-60.272678 82.610257-111.004272 0-63.901626-52.019021-116.003542-115.926787-116.003542-63.903673 0-115.927811 52.023114-115.927811 116.003542 0 50.808348 34.000156 96.392279 82.615374 111.004272 4.463013 1.365205 8.249564 4.391376 10.44781 8.558628 2.193129 4.163159 2.647515 8.931143 1.20965 13.400296l-53.455863 170.747856z m0 0" fill="#FFFFFF" ></path></symbol><symbol id="icon-shenhe2" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#A5BFFF" ></path><path d="M345.043478 602.980174v-43.408696a45.568 45.568 0 0 1 47.415652-43.408695h72.125218v-16.695653a87.151304 87.151304 0 0 1-47.415652-75.79826A91.336348 91.336348 0 0 1 512 336.695652a91.314087 91.314087 0 0 1 94.831304 86.973218 85.481739 85.481739 0 0 1-47.593739 74.974608v16.695652h71.969392a45.568 45.568 0 0 1 47.749565 44.410435v43.408696l-333.913044-0.178087z m258.114783 84.324174l-183.808-0.178087v-49.753044l185.299478 0.178087v49.753044h-1.491478z" fill="#5782FD" ></path></symbol><symbol id="icon-shenhe3" viewBox="0 0 1060 1024"><path d="M921.234286 714.715429h-69.961143c-4.498286-9.947429-13.458286-34.377143-17.408-78.628572a165.449143 165.449143 0 1 0-127.341714 3.547429c-3.584 25.161143-10.569143 58.697143-23.478858 75.081143h-72.484571a127.524571 127.524571 0 0 0-127.524571 127.524571v91.465143h565.76v-91.428572a127.524571 127.524571 0 0 0-127.561143-127.561142zM539.062857 965.595429h453.741714c14.262857 0 21.321143 7.094857 21.321143 21.284571v10.752c0 14.226286-7.094857 21.321143-21.321143 21.321143H539.062857c-14.189714 0-21.321143-7.094857-21.321143-21.321143v-10.752c0-14.189714 7.131429-21.284571 21.321143-21.284571z" fill="#108EE9" ></path><path d="M695.296 997.668571H50.834286A50.834286 50.834286 0 0 1 0 946.834286V50.834286C0 22.747429 22.747429 0 50.834286 0h644.461714c28.050286 0 50.834286 22.747429 50.834286 50.834286v896a50.834286 50.834286 0 0 1-50.834286 50.834285zM584.118857 198.217143c0-22.381714-18.176-40.521143-40.521143-40.521143H202.496a40.484571 40.484571 0 1 0 0 81.005714h341.101714c22.345143 0 40.484571-18.102857 40.484572-40.484571z m0 179.053714c0-22.345143-18.176-40.484571-40.521143-40.484571H202.496a40.484571 40.484571 0 0 0 0 81.005714h341.101714c22.345143 0 40.484571-18.139429 40.484572-40.521143z m0 179.090286c0-22.381714-18.176-40.521143-40.521143-40.521143H202.496a40.484571 40.484571 0 1 0 0 81.005714h341.101714c22.345143 0 40.484571-18.139429 40.484572-40.484571z" fill="#108EE9" opacity=".5" ></path></symbol><symbol id="icon-zu54" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#007AFF" ></path><path d="M717.824 407.466667a52.992 52.992 0 0 0-49.194667 72.533333l-83.242666 33.28-55.808-111.573333a52.992 52.992 0 1 0-47.36 0l-55.808 111.573333-83.285334-33.28a52.992 52.992 0 1 0-49.152 33.28 48.341333 48.341333 0 0 0 8.832-0.725333l28.245334 167.68a51.2 51.2 0 0 0 50.346666 44.970666h246.4a53.888 53.888 0 0 0 52.992-44.970666l28.245334-167.68a48.085333 48.085333 0 0 0 8.832 0.725333 52.992 52.992 0 1 0 0-105.941333z m-161.194667 276.608l-50.730666-26.666667-50.730667 26.666667 9.685333-56.490667-41.045333-39.978667 56.704-8.234666 25.344-51.2 25.344 51.2 56.704 8.234666-41.045333 40.021334 9.685333 56.490666z" fill="#FFFFFF" ></path></symbol><symbol id="icon-a-2labadianji3x" viewBox="0 0 1024 1024"><path d="M752 416a16 16 0 0 1 16 16v160a16 16 0 1 1-32 0v-160a16 16 0 0 1 16-16z m64-32a16 16 0 0 1 16 16v224a16 16 0 1 1-32 0v-224a16 16 0 0 1 16-16z m64-32a16 16 0 0 1 16 16v288a16 16 0 1 1-32 0v-288a16 16 0 0 1 16-16z m-220.864-134.176A64 64 0 0 1 672 256.32v513.76a64 64 0 0 1-101.728 51.712L321.152 640H192a64 64 0 0 1-64-64v-128a64 64 0 0 1 64-64h140.096l237.408-178.784a64 64 0 0 1 89.6 12.608z" fill="#2875FF" ></path></symbol></svg>',(l=>{var a=(t=(t=document.getElementsByTagName("script"))[t.length-1]).getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var h,e,i,c,o,n=function(a,t){t.parentNode.insertBefore(a,t)};if(a&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(a){console&&console.log(a)}}h=function(){var a,t=document.createElement("div");t.innerHTML=l._iconfont_svg_string_4462827,(t=t.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",t=t,(a=document.body).firstChild?n(t,a.firstChild):a.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(e=function(){document.removeEventListener("DOMContentLoaded",e,!1),h()},document.addEventListener("DOMContentLoaded",e,!1)):document.attachEvent&&(i=h,c=l.document,o=!1,m(),c.onreadystatechange=function(){"complete"==c.readyState&&(c.onreadystatechange=null,d())})}function d(){o||(o=!0,i())}function m(){try{c.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}d()}})(window);
\ No newline at end of file
window._iconfont_svg_string_4462827='<svg><symbol id="icon-tishi" viewBox="0 0 1024 1024"><path d="M919.67 723.12s-126.22-89-137.9-301.44c-9-163-97.38-230.29-180.5-252.81a69.41 69.41 0 0 0-138.39-2.28c-89.74 19.93-182.11 84.48-184.48 237.66-3 192.22-134 320.9-134 320.9 94.76 68.74 186.32 106.19 271.32 123.09 5.62 40.43 55.54 72.07 116.33 72.07 61.11 0 111.19-32 116.38-72.69 164.79-33.29 271.24-124.5 271.24-124.5z" fill="#FED547" ></path><path d="M781.78 421.68c-9-163-97.38-230.29-180.5-252.81a69.4 69.4 0 0 0-100.86-57.57 69.49 69.49 0 0 1 37.7 57.57c83.12 22.52 171.54 89.82 180.5 252.81 11.68 212.42 137.9 301.44 137.9 301.44s-106.45 91.21-271.27 124.49c-4.25 33.39-38.8 60.92-84.82 69.71a168.37 168.37 0 0 0 31.59 3c61.11 0 111.19-32 116.38-72.69 164.82-33.28 271.27-124.49 271.27-124.49S793.45 634.1 781.78 421.68z" fill="#E2B742" ></path><path d="M500.43 925.77c-61.45 0-112.55-31.08-121.09-72.92-92.43-19-183.17-60.45-269.78-123.28l-5.23-3.8 4.61-4.53c1.29-1.28 129.49-129.45 132.39-317.09 2.67-172.34 115.27-225.61 185-242.05a74.89 74.89 0 0 1 148.48 2.51c147.27 42 176.55 178.63 180.85 256.76C767 628.75 890 717.77 891.23 718.65l5.75 4.06-5.34 4.57c-1.07 0.91-107.8 91.13-270 124.93-8.16 42.21-59.3 73.56-121.21 73.56zM121.07 724.38C206 785 294.82 824.9 385.16 842.87l3.82 0.76 0.54 3.85c5.25 37.77 54 67.35 110.91 67.35 57.36 0 106.1-29.83 110.95-67.91l0.5-3.9 3.85-0.78C757 813.72 856.07 741.38 879.3 723.17 854.42 702.52 755 608.75 744.72 422c-4.17-75.83-32.64-208.86-176.47-247.83l-3.79-1-0.24-3.92a63.94 63.94 0 0 0-127.48-2.11l-0.37 4-3.89 0.87c-66.18 14.69-177.59 64.43-180.2 232.4-2.67 171.87-108.04 294.96-131.21 319.97z" fill="#28CA67" ></path></symbol><symbol id="icon-chakanxiangqing" viewBox="0 0 1024 1024"><path d="M383.6 62.8h256.3c213.6 0 320.4 106.8 320.4 320.4v256.3c0 213.6-106.8 320.4-320.4 320.4H383.6C170 959.8 63.2 853 63.2 639.4V383.2C63.2 169.6 170 62.8 383.6 62.8z" fill="#2084FE" ></path><path d="M254.1 515.3H416v-53.2H254.1zM254.1 358h363.1v53.2H254.1z" fill="#FFFFFF" opacity=".7" ></path><path d="M700.5 663.3c13.9-20.8 20.8-43.9 20.8-71.7 0-71.7-57.8-129.5-127.2-129.5S466.8 520 466.8 591.6 524.7 721 594 721c25.5 0 50.8-9.3 71.7-23.1l71.7 74 34.7-34.6-71.6-74z m-108.7 9.2c-41.7 0-76.3-34.7-76.3-78.6 0-43.9 34.7-78.6 76.3-78.6 41.7 0 76.3 34.7 76.3 78.6 0 41.7-34.7 78.6-76.3 78.6z" fill="#FFFFFF" ></path><path d="M254.1 254h363.1v53.2H254.1z" fill="#FFFFFF" opacity=".7" ></path></symbol><symbol id="icon-baojiachaxun" viewBox="0 0 1024 1024"><path d="M0 0m178.086957 0l667.826086 0q178.086957 0 178.086957 178.086957l0 667.826086q0 178.086957-178.086957 178.086957l-667.826086 0q-178.086957 0-178.086957-178.086957l0-667.826086q0-178.086957 178.086957-178.086957Z" fill="#2E7BFC" ></path><path d="M790.327652 721.363478l23.730087 23.730087a42.073043 42.073043 0 0 1 0 59.481044l-9.48313 9.48313a42.073043 42.073043 0 0 1-59.481044 0l-23.730087-23.730087a42.073043 42.073043 0 0 1 0-59.503304l9.46087-9.46087a42.073043 42.073043 0 0 1 59.503304 0zM505.499826 226.081391c154.312348 0 279.418435 125.106087 279.418435 279.418435 0 154.312348-125.106087 279.418435-279.418435 279.418435-154.312348 0-279.418435-125.106087-279.418435-279.418435 0-154.312348 125.106087-279.418435 279.418435-279.418435z m-100.797217 158.764522a19.300174 19.300174 0 0 0-0.24487 25.377391l1.847652 1.869913 44.076522 39.201392h-58.278956l-2.626783 0.178087a19.300174 19.300174 0 0 0 0.200348 38.288695l2.426435 0.133566h84.902956v38.622608h-61.751652l-2.604522 0.178087a19.300174 19.300174 0 0 0 0.200348 38.288696l2.404174 0.133565h61.751652l0.022261 83.656348 0.178087 2.604522a19.300174 19.300174 0 0 0 38.288696-0.200348l0.155826-2.404174-0.044522-83.656348h61.796174l2.626782-0.178087a19.300174 19.300174 0 0 0-0.200347-38.288696l-2.426435-0.133565h-61.796174v-38.622608h84.969739l2.626783-0.178087a19.300174 19.300174 0 0 0-0.222609-38.288696l-2.404174-0.133565h-58.323478l44.121043-39.179131 2.003478-2.070261a19.300174 19.300174 0 0 0-25.577739-28.404869l-2.070261 1.602782-64.400695 57.210435-64.378435-57.210435-2.270609-1.736347a19.300174 19.300174 0 0 0-24.976695 3.33913z" fill="#FFFFFF" ></path></symbol><symbol id="icon-caozuorizhi" viewBox="0 0 1024 1024"><path d="M312.416187 5.855995C376.992127 1.951998 443.520064 0 512 0c68.479936 0 135.007873 1.951998 199.583813 5.855995a319.9997 319.9997 0 0 1 298.14372 279.359738 1811.582302 1811.582302 0 0 1 0 453.535574 319.9997 319.9997 0 0 1-298.14372 279.359739A3304.316902 3304.316902 0 0 1 512 1023.99904c-68.479936 0-135.007873-1.951998-199.583813-5.855995a319.9997 319.9997 0 0 1-298.14372-279.359738 1811.582302 1811.582302 0 0 1 0-453.535574A319.9997 319.9997 0 0 1 312.416187 5.887994z" fill="#40C791" ></path><path d="M384.00012 298.65572A85.34392 85.34392 0 0 0 469.34404 383.99964h85.31192A85.34392 85.34392 0 0 0 639.99988 298.65572h42.65596A85.34392 85.34392 0 0 1 767.99976 383.99964v298.65572A85.34392 85.34392 0 0 1 682.65584 767.99928H341.34416A85.34392 85.34392 0 0 1 256.00024 682.65536V383.99964a85.34392 85.34392 0 0 1 85.34392-85.34392H384.00012z m0 1.311999h255.99976-255.99976z m149.34386 169.375841a21.34398 21.34398 0 1 0 0 42.65596h127.99988a21.34398 21.34398 0 0 0 0-42.65596h-127.99988z m0 127.99988a21.34398 21.34398 0 1 0 0 42.65596h127.99988a21.34398 21.34398 0 0 0 0-42.65596h-127.99988z m-140.479868-119.167888l-15.103986-15.103986a21.34398 21.34398 0 0 0-30.175972 30.207972l30.175972 30.143971a21.27998 21.27998 0 0 0 30.175972 0l60.319943-60.351943a21.34398 21.34398 0 1 0-30.175972-30.143972l-45.247957 45.247958z m0 127.99988l-15.103986-15.103986a21.34398 21.34398 0 0 0-30.175972 30.207972l30.175972 30.143971a21.27998 21.27998 0 0 0 30.175972 0l60.319943-60.351943a21.34398 21.34398 0 1 0-30.175972-30.143972l-45.247957 45.247958zM469.31204 255.99976h85.31192a42.65596 42.65596 0 1 1 0 85.34392h-85.31192a42.65596 42.65596 0 1 1 0-85.34392z" fill="#FFFFFF" ></path></symbol><symbol id="icon-querenshenhexunjia" viewBox="0 0 1024 1024"><path d="M474.500517 639.29203a320.016772 320.016772 0 0 0 93.819328 378.808334 51.976684 51.976684 0 0 1-53.777507-7.16798l-72.950971-58.120668-65.323958 58.120668c-9.321905 8.121357-21.327389 12.535138-33.650666 12.429207a50.140551 50.140551 0 0 1-33.368184-12.287966L243.995222 952.952957l-65.994852 58.615011a50.987997 50.987997 0 0 1-33.544735 12.429207 50.140551 50.140551 0 0 1-33.438805-12.287966L34.499524 943.595742a35.310247 35.310247 0 0 1-6.249914-7.06205A67.407262 67.407262 0 0 1 0.001412 882.756186V51.41172C0.001412 23.057592 23.023694 0 50.742238 0h794.480567c28.036336 0 50.776136 22.84573 50.776136 51.41172V474.569725a319.981462 319.981462 0 0 0-421.498424 164.686994zM127.612647 227.397993h333.575907c14.088789 0 25.211517-11.334589 25.211517-25.282137a25.458688 25.458688 0 0 0-25.211517-25.282137H127.612647a25.070276 25.070276 0 0 0-25.211517 24.964345v0.317792c0 13.559135 11.263969 25.282137 25.211517 25.282137z m231.423361 227.327373a24.752483 24.752483 0 0 0 24.964345-25.211516 25.423378 25.423378 0 0 0-24.964345-25.282138H127.365475a24.823104 24.823104 0 0 0-24.964345 24.717174v0.564964c0 13.488515 11.193348 25.211517 24.964345 25.211516h231.670533z m-26.235514 176.833719a25.176206 25.176206 0 0 0-24.646552-25.211516H127.047683a24.929035 24.929035 0 0 0-24.646553 25.211516c0 13.559135 11.016797 25.282137 24.646553 25.282138h181.141569a24.964345 24.964345 0 0 0 24.611242-25.282138zM766.09254 511.998588a255.999294 255.999294 0 1 1 0 511.998587 255.999294 255.999294 0 0 1 0-511.998587z m145.195738 206.105914a26.553306 26.553306 0 0 0-37.605414-37.428862l-131.001018 131.001017-84.25025-84.21494a26.447375 26.447375 0 1 0-37.428862 37.428863l102.999992 103.035302a26.517996 26.517996 0 0 0 37.428862 0l149.85669-149.82138z" fill="#389AFB" ></path></symbol><symbol id="icon-shenhe" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#00CD82" ></path><path d="M512 744.727273h-211.549091a16.989091 16.989091 0 0 1-16.989091-16.989091V318.836364a16.989091 16.989091 0 0 1 16.989091-16.989091h335.127273a16.989091 16.989091 0 0 1 16.989091 16.989091v144.756363a17.221818 17.221818 0 0 0 34.210909 0V318.836364a51.2 51.2 0 0 0-50.967273-50.967273H300.450909a51.2 51.2 0 0 0-50.967273 50.967273v408.203636a51.2 51.2 0 0 0 50.967273 51.2H512A17.221818 17.221818 0 0 0 512 744.727273z m0 0" fill="#FFFFFF" ></path><path d="M596.945455 361.425455H330.007273a16.989091 16.989091 0 1 0 0 33.978181h266.938182a16.989091 16.989091 0 0 0 0-33.978181z m0 84.945454H330.007273a17.221818 17.221818 0 1 0 0 34.210909h266.938182a17.221818 17.221818 0 0 0 0-34.210909z m-42.821819 85.178182h-224.116363a16.989091 16.989091 0 1 0 0 33.978182h224.349091a16.989091 16.989091 0 0 0 16.989091-16.989091 17.454545 17.454545 0 0 0-17.221819-16.989091z m220.16 262.050909h-184.087272a15.592727 15.592727 0 1 0 0 31.185455h184.087272a16.756364 16.756364 0 0 0 17.221819-16.058182 16.290909 16.290909 0 0 0-17.221819-15.127273z m-4.887272-122.181818h-36.072728c-4.887273-9.774545 0-28.625455 16.290909-50.734546a84.014545 84.014545 0 0 0 13.265455-43.985454 78.196364 78.196364 0 0 0-82.152727-74.007273 77.498182 77.498182 0 0 0-81.687273 74.007273 83.316364 83.316364 0 0 0 13.265455 43.752727v1.629091c15.127273 22.109091 21.178182 40.494545 16.523636 50.734545h-34.676364a35.607273 35.607273 0 0 0-37.003636 34.443637v54.458182a14.894545 14.894545 0 0 0 15.36 13.963636H791.272727a14.429091 14.429091 0 0 0 15.127273-13.498182v-56.32a35.607273 35.607273 0 0 0-37.003636-34.443636z m3.025454 71.447273h-181.061818v-37.003637a2.792727 2.792727 0 0 1 2.792727-2.792727h48.64a7.447273 7.447273 0 0 0 4.887273-1.861818c26.530909-19.549091 25.134545-53.76-4.421818-96.581818a57.250909 57.250909 0 0 1-9.309091-29.556364 48.174545 48.174545 0 0 1 95.650909 0 54.225455 54.225455 0 0 1-9.541818 30.021818c-29.323636 42.821818-30.487273 77.032727-4.189091 96.581818a7.447273 7.447273 0 0 0 4.887273 1.861818H768a2.792727 2.792727 0 0 1 2.792727 2.792728v37.003636z m-215.272727-126.37091h-227.141818a17.221818 17.221818 0 1 0 0 34.21091h227.141818a17.221818 17.221818 0 1 0 0-34.21091z m0 0" fill="#FFFFFF" ></path></symbol><symbol id="icon-shenhe1" viewBox="0 0 1024 1024"><path d="M0.000608 512c0 282.766309 229.228574 512 512 512 282.766309 0 512-229.233691 512-512C1024.000608 229.228574 794.766917 0 512.000608 0 229.229182 0 0.000608 229.228574 0.000608 512z m0 0" fill="#FF7A65" ></path><path d="M708.338383 848.605944h-392.67555c-4.845762 0-8.71009-3.934943-8.710091-8.71009v-37.856297c0-4.845762 3.94006-8.71009 8.710091-8.710091h392.754351c4.845762 0 8.70395 3.934943 8.70395 8.710091v37.856297c0 4.845762-3.936989 8.71009-8.782751 8.71009z m-383.966484-17.490794h375.262534v-20.366527H324.371899v20.366527z m0 0" fill="#FFFFFF" ></path><path d="M739.601989 810.064997H284.38797c-28.925154 0-52.473407-23.547229-52.473407-52.473406v-72.007916c0-28.925154 23.548252-52.472383 52.473407-52.472383h455.219136c28.925154 0 52.473407 23.547229 52.473406 52.472383v72.007916c0 28.927201-23.548252 52.473407-52.478523 52.473406zM284.38797 668.093904c-9.614769 0-17.491818 7.870909-17.491818 17.489771v72.007916c0 9.614769 7.877049 17.491818 17.491818 17.491817h455.219136c9.613745 0 17.490794-7.877049 17.490794-17.491817v-72.007916c0-9.618862-7.877049-17.489771-17.490794-17.489771H284.38797z m0 0" fill="#FFFFFF" ></path><path d="M610.890987 664.989956H413.188007c-5.529388 0-10.829535-2.652632-14.082899-7.116669-3.331141-4.473247-4.24196-10.302488-2.575878-15.602636l55.426916-177.55853c-54.287881-23.697668-90.862891-78.291543-90.862891-138.414806 0-83.214059 67.693294-150.908376 150.908376-150.908376 83.214059 0 150.908376 67.694318 150.908377 150.908376 0 60.123263-36.57501 114.789799-90.862892 138.414806l55.503671 177.637331c1.665059 5.300148 0.677486 11.051611-2.574854 15.597519-3.331141 4.391376-8.560675 7.044008-14.088016 7.044008h0.00307z m-173.923441-34.981589h150.147996l-53.383203-170.747856a17.901175 17.901175 0 0 1 1.214767-13.400296 17.564479 17.564479 0 0 1 10.44781-8.558628c48.610102-14.610969 82.610258-60.272678 82.610257-111.004272 0-63.901626-52.019021-116.003542-115.926787-116.003542-63.903673 0-115.927811 52.023114-115.927811 116.003542 0 50.808348 34.000156 96.392279 82.615374 111.004272 4.463013 1.365205 8.249564 4.391376 10.44781 8.558628 2.193129 4.163159 2.647515 8.931143 1.20965 13.400296l-53.455863 170.747856z m0 0" fill="#FFFFFF" ></path></symbol><symbol id="icon-shenhe2" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#A5BFFF" ></path><path d="M345.043478 602.980174v-43.408696a45.568 45.568 0 0 1 47.415652-43.408695h72.125218v-16.695653a87.151304 87.151304 0 0 1-47.415652-75.79826A91.336348 91.336348 0 0 1 512 336.695652a91.314087 91.314087 0 0 1 94.831304 86.973218 85.481739 85.481739 0 0 1-47.593739 74.974608v16.695652h71.969392a45.568 45.568 0 0 1 47.749565 44.410435v43.408696l-333.913044-0.178087z m258.114783 84.324174l-183.808-0.178087v-49.753044l185.299478 0.178087v49.753044h-1.491478z" fill="#5782FD" ></path></symbol><symbol id="icon-shenhe3" viewBox="0 0 1060 1024"><path d="M921.234286 714.715429h-69.961143c-4.498286-9.947429-13.458286-34.377143-17.408-78.628572a165.449143 165.449143 0 1 0-127.341714 3.547429c-3.584 25.161143-10.569143 58.697143-23.478858 75.081143h-72.484571a127.524571 127.524571 0 0 0-127.524571 127.524571v91.465143h565.76v-91.428572a127.524571 127.524571 0 0 0-127.561143-127.561142zM539.062857 965.595429h453.741714c14.262857 0 21.321143 7.094857 21.321143 21.284571v10.752c0 14.226286-7.094857 21.321143-21.321143 21.321143H539.062857c-14.189714 0-21.321143-7.094857-21.321143-21.321143v-10.752c0-14.189714 7.131429-21.284571 21.321143-21.284571z" fill="#108EE9" ></path><path d="M695.296 997.668571H50.834286A50.834286 50.834286 0 0 1 0 946.834286V50.834286C0 22.747429 22.747429 0 50.834286 0h644.461714c28.050286 0 50.834286 22.747429 50.834286 50.834286v896a50.834286 50.834286 0 0 1-50.834286 50.834285zM584.118857 198.217143c0-22.381714-18.176-40.521143-40.521143-40.521143H202.496a40.484571 40.484571 0 1 0 0 81.005714h341.101714c22.345143 0 40.484571-18.102857 40.484572-40.484571z m0 179.053714c0-22.345143-18.176-40.484571-40.521143-40.484571H202.496a40.484571 40.484571 0 0 0 0 81.005714h341.101714c22.345143 0 40.484571-18.139429 40.484572-40.521143z m0 179.090286c0-22.381714-18.176-40.521143-40.521143-40.521143H202.496a40.484571 40.484571 0 1 0 0 81.005714h341.101714c22.345143 0 40.484571-18.139429 40.484572-40.484571z" fill="#108EE9" opacity=".5" ></path></symbol><symbol id="icon-zu54" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" fill="#007AFF" ></path><path d="M717.824 407.466667a52.992 52.992 0 0 0-49.194667 72.533333l-83.242666 33.28-55.808-111.573333a52.992 52.992 0 1 0-47.36 0l-55.808 111.573333-83.285334-33.28a52.992 52.992 0 1 0-49.152 33.28 48.341333 48.341333 0 0 0 8.832-0.725333l28.245334 167.68a51.2 51.2 0 0 0 50.346666 44.970666h246.4a53.888 53.888 0 0 0 52.992-44.970666l28.245334-167.68a48.085333 48.085333 0 0 0 8.832 0.725333 52.992 52.992 0 1 0 0-105.941333z m-161.194667 276.608l-50.730666-26.666667-50.730667 26.666667 9.685333-56.490667-41.045333-39.978667 56.704-8.234666 25.344-51.2 25.344 51.2 56.704 8.234666-41.045333 40.021334 9.685333 56.490666z" fill="#FFFFFF" ></path></symbol><symbol id="icon-a-2labadianji3x" viewBox="0 0 1024 1024"><path d="M752 416a16 16 0 0 1 16 16v160a16 16 0 1 1-32 0v-160a16 16 0 0 1 16-16z m64-32a16 16 0 0 1 16 16v224a16 16 0 1 1-32 0v-224a16 16 0 0 1 16-16z m64-32a16 16 0 0 1 16 16v288a16 16 0 1 1-32 0v-288a16 16 0 0 1 16-16z m-220.864-134.176A64 64 0 0 1 672 256.32v513.76a64 64 0 0 1-101.728 51.712L321.152 640H192a64 64 0 0 1-64-64v-128a64 64 0 0 1 64-64h140.096l237.408-178.784a64 64 0 0 1 89.6 12.608z" fill="#2875FF" ></path></symbol></svg>',(t=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,e,c,o,n=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=t._iconfont_svg_string_4462827,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?n(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(e=h,c=t.document,o=!1,m(),c.onreadystatechange=function(){"complete"==c.readyState&&(c.onreadystatechange=null,d())})}function d(){o||(o=!0,e())}function m(){try{c.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}d()}})(window);
\ No newline at end of file
public/iconfont/iconfont.json
......@@ -6,6 +6,13 @@
"description": "",
"glyphs": [
{
"icon_id": "3833188",
"name": "提示",
"font_class": "tishi",
"unicode": "e605",
"unicode_decimal": 58885
},
{
"icon_id": "22718987",
"name": "查看详情",
"font_class": "chakanxiangqing",
......
src/api/factoryOrderNew.ts
......@@ -107,6 +107,7 @@ export function transferOldFlowApi(ids: (number | string)[]) {
export function confirmOrderWithWarehouseApi(
ids: (number | string)[],
warehouseId: number | string,
warehouseName: string,
) {
return axios.post<
never,
......@@ -118,7 +119,11 @@ export function confirmOrderWithWarehouseApi(
status?: boolean
}[]
>
>('factory/podOrder/ordersAccepted', { podOrderIds: ids, warehouseId })
>('factory/podOrder/ordersAccepted', {
podOrderIds: ids,
warehouseId,
warehouseName,
})
}
export function cancelOrderWithReasonApi(
......@@ -188,9 +193,23 @@ export function restockCheckApi(id: number | string) {
)
}
export function pickCompleteByIdsDataApi(ids: (number | string)[]) {
return axios.post<
never,
BaseRespData<{
overallMessage?: string
pickingSituationList?: PickCompleteData[]
allAvailableOrderIds?: number[]
partialAvailableOrderIds?: number[]
unavailableOrderIds?: number[]
}>
>('factory/podOrderOperation/getPickingSituation', ids)
}
export function pickCompleteApi(ids: (number | string)[]) {
return axios.post<never, BaseRespData<PickCompleteData[]>>(
'factory/podOrderOperation/listByIds',
return axios.post<never, BaseRespData<void>>(
'factory/podOrderOperation/pickingComplete',
ids,
)
}
......
src/components/Icon.vue
<template>
<i
v-if="unicodeIcon"
class="erpIconfont erp unicode-icon"
class="iconfont factory unicode-icon"
v-html="unicodeIcon"
></i>
<svg v-else class="svg-icon erp" aria-hidden="true">
<svg v-else class="svg-icon factory" aria-hidden="true">
<slot name="title"></slot>
<use :xlink:href="svgIcon"></use>
</svg>
......@@ -19,7 +19,7 @@ const props = defineProps({
}
})
const unicodeIcon = computed(() => {
if (props.name.match(/^x[a-f0-9]{4}$/)) {
if (props.name.match(/^x[a-f0-9]{4,}$/)) {
return `&#${props.name};`
}
return undefined
......
src/types/api/factoryOrderNew.ts
......@@ -210,14 +210,16 @@ export interface PickCompleteData {
warehouseName?: string
skuImage?: string
productName?: string
styleNo?: string
stockSku?: string
pickQuantity?: number
availableStock?: number
stockQuantity?: number
supplierProductNo?: string
thirdSkuCode?: string
selectedQuantity?: number
availableInventory?: number
inventory?: number
producingQuantity?: number
occupiedQuantity?: number
pickStatus?: 'success' | 'partial' | 'fail'
occupyInventory?: number
pickingStatus?: string
availableOrderIds?: number[]
allOrderIds?: number[]
}
export interface PickFailData {
......
src/views/order/factoryOrderNew/component/ConfirmOrderDialog.vue
......@@ -42,12 +42,14 @@ import { confirmOrderWithWarehouseApi } from '@/api/factoryOrderNew'
import type { WarehouseListData } from '@/types'
const emit = defineEmits<{
success: [data: {
factoryOrderNumber?: string
message?: string
id: number | string
status?: boolean
}[]]
success: [
data: {
factoryOrderNumber?: string
message?: string
id: number | string
status?: boolean
}[],
]
}>()
const visible = ref(false)
......@@ -89,11 +91,15 @@ const handleClose = () => {
const handleSubmit = async () => {
if (!formRef.value) return
await formRef.value.validate()
const warehouseName = warehouseList.value.find(
(item) => item.id === form.warehouseId,
)?.name
submitLoading.value = true
try {
const res = await confirmOrderWithWarehouseApi(
orderIds.value,
form.warehouseId,
warehouseName || '',
)
if (res.code !== 200) return
visible.value = false
......
src/views/order/factoryOrderNew/component/PickCompleteDialog.vue
......@@ -2,64 +2,73 @@
<ElDialog
v-model="visible"
title="拣胚完成"
width="1200px"
width="1400px"
:close-on-click-modal="false"
@close="handleClose"
>
<div class="pick-complete-actions" style="margin-bottom: 10px">
<span class="item">
<ElButton type="success" @click="handleCreateInbound">
创建入库单
</ElButton>
</span>
</div>
<div class="table-view">
<TableView
:paginated-data="tableData"
:columns="columns"
serial-numberable
selectionable
>
<template #skuImage="{ row }">
<el-image
v-if="row.variantImage"
:src="row.variantImage"
style="width: 50px; height: 50px"
fit="contain"
:preview-src-list="[row.variantImage]"
preview-teleported
/>
</template>
<template #pickQuantity="{ row }">
<span style="color: #e6a23c; font-weight: bold">{{
row.pickQuantity
}}</span>
</template>
<template #pickStatus="{ row }">
<span v-if="row.pickStatus === 'fail'" style="color: #f56c6c">
✕ 无法拣胚
</span>
<span v-else-if="row.pickStatus === 'partial'" class="item">
<ElButton type="warning" size="small">调整拣胚顺序</ElButton>
</span>
<span v-else style="color: #67c23a"> ✓ 直接拣胚 </span>
</template>
</TableView>
<div v-if="pickData" class="pick-order-data">
<div class="pick-order-data-message">
<Icon style="width: 24px; height: 24px" name="tishi" />
<span> {{ pickData.overallMessage }}! </span>
</div>
<div class="pick-complete-actions" style="margin-bottom: 10px">
<span class="item">
<ElButton type="success" @click="handleCreateInbound">
创建入库单
</ElButton>
</span>
</div>
<div class="table-view">
<TableView
:paginated-data="pickData.pickingSituationList"
:columns="columns"
serial-numberable
selectionable
@selection-change="handleSelectionChange"
>
<template #skuImage="{ row }">
<el-image
v-if="row.skuImage"
:src="row.skuImage"
style="width: 50px; height: 50px"
fit="contain"
:preview-src-list="[row.skuImage]"
preview-teleported
/>
</template>
<template #pickQuantity="{ row }">
<span style="color: #e6a23c; font-weight: bold">{{
row.selectedQuantity
}}</span>
</template>
<template #pickStatus="{ row }">
<span
v-if="row.pickingStatus === 'fail'"
style="color: #f56c6c; font-weight: 500"
>
✕ 无法拣胚
</span>
<span v-else-if="row.pickingStatus === 'partial'" class="item">
<ElButton type="warning" size="small">调整拣胚顺序</ElButton>
</span>
<span
v-else-if="row.pickingStatus === 'success'"
style="color: #67c23a; font-weight: 500"
>
✓ 直接拣胚
</span>
<span v-else style="color: #999; font-weight: 500">未知状态</span>
</template>
</TableView>
</div>
</div>
<template #footer>
<div class="dialog-footer" style="text-align: center">
<span class="item">
<ElButton @click="visible = false">取消</ElButton>
</span>
<span class="item">
<ElButton
type="primary"
:loading="submitLoading"
@click="handleSubmit"
>
确定
</ElButton>
<ElButton type="primary" @click="handleSubmit"> 确定 </ElButton>
</span>
</div>
</template>
......@@ -69,26 +78,33 @@
<script setup lang="ts">
import { ref } from 'vue'
import { ElMessage } from 'element-plus'
import { pickCompleteApi } from '@/api/factoryOrderNew'
import {
pickCompleteByIdsDataApi,
pickCompleteApi,
} from '@/api/factoryOrderNew'
import type { PickCompleteData } from '@/types/api/factoryOrderNew'
import TableView from '@/components/TableView.vue'
import type { CustomColumn } from '@/types/table'
import Icon from '@/components/Icon.vue'
interface PickData {
overallMessage?: string
pickingSituationList?: PickCompleteData[]
allAvailableOrderIds?: number[]
partialAvailableOrderIds?: number[]
unavailableOrderIds?: number[]
}
const emit = defineEmits<{
success: []
}>()
const visible = ref(false)
const submitLoading = ref(false)
const tableData = ref<PickCompleteData[]>([])
const orderIds = ref<(number | string)[]>([])
const pickData = ref<PickData | null>(null)
const selections = ref<PickCompleteData[]>([])
const columns: CustomColumn<PickCompleteData>[] = [
const columns = [
{
key: 'warehouseName',
prop: 'warehouseName',
label: '仓库名称',
minWidth: 100,
minWidth: 120,
},
{
key: 'skuImage',
......@@ -104,48 +120,55 @@ const columns: CustomColumn<PickCompleteData>[] = [
minWidth: 120,
showOverflowTooltip: true,
},
{ key: 'styleNo', prop: 'styleNo', label: '款号', minWidth: 80 },
{ key: 'stockSku', prop: 'stockSku', label: '库存SKU', minWidth: 120 },
{
key: 'pickQuantity',
prop: 'pickQuantity',
label: '本次拣胚数量',
minWidth: 110,
prop: 'supplierProductNo',
label: '款号',
width: 100,
align: 'center',
},
{
key: 'thirdSkuCode',
prop: 'thirdSkuCode',
label: '库存SKU',
align: 'center',
width: 180,
},
{
key: 'selectedQuantity',
prop: 'selectedQuantity',
label: '本次拣胚数量',
width: 110,
align: 'right',
slot: 'pickQuantity',
},
{
key: 'availableStock',
prop: 'availableStock',
prop: 'availableInventory',
label: '可调配库存',
minWidth: 100,
align: 'center',
width: 100,
align: 'right',
},
{
key: 'stockQuantity',
prop: 'stockQuantity',
prop: 'inventory',
label: '库存数量',
minWidth: 90,
align: 'center',
width: 90,
align: 'right',
},
{
key: 'producingQuantity',
prop: 'producingQuantity',
label: '生产中数量',
minWidth: 100,
align: 'center',
width: 100,
align: 'right',
},
{
key: 'occupiedQuantity',
prop: 'occupiedQuantity',
prop: 'occupyInventory',
label: '占用数量',
minWidth: 90,
align: 'center',
width: 90,
align: 'right',
},
{
key: 'pickStatus',
label: '拣胚情况',
minWidth: 130,
width: 130,
align: 'center',
fixed: 'right',
slot: 'pickStatus',
......@@ -153,34 +176,54 @@ const columns: CustomColumn<PickCompleteData>[] = [
]
const open = async (ids: (number | string)[]) => {
orderIds.value = ids
visible.value = true
selections.value = []
pickData.value = null
const loading = ElLoading.service({
text: '操作中...',
background: 'rgba(0, 0, 0, 0.3)',
})
try {
const res = await pickCompleteApi(ids)
tableData.value = res.data || []
} catch (_e) {
tableData.value = []
const res = await pickCompleteByIdsDataApi(ids)
if (res.code !== 200) return
pickData.value = res.data || null
visible.value = true
} catch (e) {
console.error(e)
} finally {
loading.close()
}
}
const handleClose = () => {
tableData.value = []
pickData.value = null
}
const handleCreateInbound = () => {
ElMessage.info('创建入库单功能待实现')
}
const handleSelectionChange = (selection: PickCompleteData[]) => {
selections.value = selection
}
const handleSubmit = async () => {
submitLoading.value = true
const loading = ElLoading.service({
text: '操作中...',
background: 'rgba(0, 0, 0, 0.3)',
})
const orderIds = pickData.value?.pickingSituationList
?.map((item) => item.availableOrderIds)
.flat()
try {
const res = await pickCompleteApi(orderIds as (number | string)[])
if (res.code !== 200) return
ElMessage.success('拣胚完成')
visible.value = false
emit('success')
} catch (_e) {
ElMessage.error('操作失败')
} catch (e) {
console.error(e)
} finally {
submitLoading.value = false
loading.close()
}
}
......@@ -191,4 +234,12 @@ defineExpose({ open })
.table-view {
height: 600px;
}
.pick-order-data-message {
font-size: 14px;
color: #f56c6c;
margin-bottom: 10px;
font-weight: bold;
display: flex;
align-items: center;
}
</style>
src/views/order/factoryOrderNew/index.vue
......@@ -714,9 +714,9 @@
<!-- 表格布局 -->
<div v-if="isTableLayout" class="table-content">
<splitDiv v-loading="loading" size="55">
<splitDiv size="55">
<template #top>
<div class="table-list flex-1 overflow-hidden">
<div v-loading="loading" class="table-list flex-1 overflow-hidden">
<TableView
ref="tableRef"
highlight-current-row
......@@ -763,7 +763,7 @@
@tab-click="handleTabClick"
>
<el-tab-pane name="product" label="包含商品">
<div class="sub-table-wrapper">
<div v-loading="subLoading" class="sub-table-wrapper">
<TableView
:paginated-data="productList"
:columns="productColumns"
......@@ -772,7 +772,7 @@
</div>
</el-tab-pane>
<el-tab-pane name="log" label="操作日志">
<div class="detail-table-content">
<div v-loading="subLoading" class="detail-table-content">
<LogList :log-list="logList" />
<div v-if="!logList.length" class="empty-content">
暂无数据
......@@ -935,6 +935,7 @@ const cardLayoutStatuses = [
'PENDING_PACKING',
]
const specialLayoutStatuses = ['BATCH_MANAGE', 'AWAITING_RESTOCK']
const subLoading = ref(false)
const isCardLayout = computed(() => cardLayoutStatuses.includes(status.value))
const isSpecialLayout = computed(() =>
specialLayoutStatuses.includes(status.value),
......@@ -1578,6 +1579,7 @@ const getOrderDetailsById = async (tabName?: 'product' | 'log') => {
const id = currentRow.value.id
const isSuspend = status.value === 'SUSPEND'
const effectiveTab = tabName ?? activeTab.value
subLoading.value = true
try {
if (effectiveTab === 'product') {
productList.value = []
......@@ -1594,6 +1596,8 @@ const getOrderDetailsById = async (tabName?: 'product' | 'log') => {
}
} catch (e) {
console.error(e)
} finally{
subLoading.value = false
}
}
watch(currentRow, (row) => {
......@@ -2031,7 +2035,7 @@ const handlePrintPickOrder = async () => {
}
}
const handlePickComplete = () => {
// if (!ensureSelection()) return
if (!ensureSelection()) return
pickCompleteDialogRef.value?.open(getSelectedIds())
}
const handlePickFail = () => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment